Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
commit908cf4b925e419bc74f3297b2f0e51d6f8a81da2
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 21 Jul 2008 04:55:14 +0000 (21 00:55 -0400)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 21 Jul 2008 04:55:14 +0000 (21 00:55 -0400)
tree6c2da79366d4695a9c2560ab18259eca8a2a25b4
parent92c49890922d54cba4b1eadeb0b185773c2c9570
parent14b395e35d1afdd8019d11b92e28041fad591b71
Merge /linux/kernel/git/torvalds/linux-2.6 into next
MAINTAINERS
drivers/char/keyboard.c
drivers/hwmon/hdaps.c
drivers/input/input.c
drivers/input/serio/hp_sdc_mlc.c
drivers/input/serio/q40kbd.c
drivers/macintosh/adbhid.c
include/linux/input.h