Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Dmitry Torokhov [Mon, 21 Jul 2008 04:55:14 +0000 (00:55 -0400)]
1  2 
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

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge