Dmitry Torokhov 95d465fd75 Manual merge with Linus.
Conflicts:
	arch/powerpc/kernel/setup-common.c
	drivers/input/keyboard/hil_kbd.c
	drivers/input/mouse/hil_ptr.c
2006-04-02 00:08:05 -05:00
..
2006-03-24 07:33:24 -08:00
2006-03-20 14:49:52 -08:00
2006-03-20 14:49:52 -08:00
2006-03-20 14:49:56 -08:00
2006-03-20 14:49:52 -08:00