git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af18ddb 29454dd)
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorSteven Whitehouse <swhiteho@redhat.com>
Mon, 3 Jul 2006 14:25:08 +0000 (10:25 -0400)
committerSteven Whitehouse <swhiteho@redhat.com>
Mon, 3 Jul 2006 14:25:08 +0000 (10:25 -0400)
Conflicts:

include/linux/kernel.h


Trivial merge
Pandora Kernel Repository