git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b11d212 2b9e0aa)
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 13 Oct 2007 01:27:47 +0000 (21:27 -0400)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 13 Oct 2007 01:27:47 +0000 (21:27 -0400)
Conflicts:

drivers/macintosh/adbhid.c


Trivial merge
Pandora Kernel Repository