]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
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)
commit95d465fd750897ab32462a6702fbfe1b122cbbc0
tree65c38b2f11c51bb6932e44dd6c92f15b0091abfe
parent642fde17dceceb56c7ba2762733ac688666ae657
parent683aa4012f53b2ada0f430487e05d37b0d94e90a
Manual merge with Linus.

Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
12 files changed:
arch/alpha/kernel/setup.c
arch/i386/kernel/setup.c
arch/mips/Kconfig
arch/powerpc/kernel/setup-common.c
drivers/Makefile
drivers/input/input.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
drivers/input/serio/hil_mlc.c
include/linux/gameport.h
include/linux/input.h
include/linux/serio.h