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)
commit334d0dd8b660557608142f0f77abc6812b48f08b
tree9393a9aa099d7d42deda5f9f5054796c0c769be7
parent3f07d8796262f6aee135c8dd9a91210da9f888e4
parent5b94f675f57e4ff16c8fda09088d7480a84dcd91
Merge git://git./linux/kernel/git/torvalds/linux-2.6
drivers/input/evdev.c
drivers/input/keyboard/Kconfig