git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56f0356 b05948d)
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
authorDmitry Torokhov <dtor_core@ameritech.net>
Wed, 21 Dec 2005 04:03:50 +0000 (23:03 -0500)
committerDmitry Torokhov <dtor_core@ameritech.net>
Wed, 21 Dec 2005 04:03:50 +0000 (23:03 -0500)

Trivial merge
Pandora Kernel Repository