Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dtor@insightbb.com>
Tue, 8 May 2007 05:31:11 +0000 (01:31 -0400)
committerDmitry Torokhov <dtor@insightbb.com>
Tue, 8 May 2007 05:31:11 +0000 (01:31 -0400)
1  2 
drivers/input/evdev.c
drivers/input/keyboard/Kconfig

Simple merge
Simple merge