git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d29cdf dc87c39)
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dtor@insightbb.com>
Tue, 1 May 2007 04:24:54 +0000 (00:24 -0400)
committerDmitry Torokhov <dtor@insightbb.com>
Tue, 1 May 2007 04:24:54 +0000 (00:24 -0400)
Conflicts:

drivers/usb/input/Makefile
drivers/usb/input/gtco.c


Trivial merge
Pandora Kernel Repository