tree 65c38b2f11c51bb6932e44dd6c92f15b0091abfe
parent 642fde17dceceb56c7ba2762733ac688666ae657
parent 683aa4012f53b2ada0f430487e05d37b0d94e90a
author Dmitry Torokhov <dtor_core@ameritech.net> 1143954485 -0500
committer Dmitry Torokhov <dtor_core@ameritech.net> 1143954485 -0500

Manual merge with Linus.

Conflicts:
	arch/powerpc/kernel/setup-common.c
	drivers/input/keyboard/hil_kbd.c
	drivers/input/mouse/hil_ptr.c