| commit | 0a1340c185734a57fbf4775927966ad4a1347b02 | [log] [tgz] |
|---|---|---|
| author | Steven Whitehouse <swhiteho@redhat.com> | Mon Jul 03 10:25:08 2006 -0400 |
| committer | Steven Whitehouse <swhiteho@redhat.com> | Mon Jul 03 10:25:08 2006 -0400 |
| tree | d9ed8f0dd809a7c542a3356601125ea5b5aaa804 | |
| parent | af18ddb8864b096e3ed4732e2d4b21c956dcfe3a [diff] | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba [diff] |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: include/linux/kernel.h