git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 642fde1 683aa40)
Manual merge with Linus.
authorDmitry Torokhov <dtor_core@ameritech.net>
Sun, 2 Apr 2006 05:08:05 +0000 (00:08 -0500)
committerDmitry Torokhov <dtor_core@ameritech.net>
Sun, 2 Apr 2006 05:08:05 +0000 (00:08 -0500)
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c


Trivial merge
Pandora Kernel Repository