Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/char/keyboard.c
Simple merge

diff --cc drivers/hwmon/hdaps.c
Simple merge

diff --cc drivers/input/input.c
Simple merge

diff --cc drivers/input/serio/hp_sdc_mlc.c
Simple merge

diff --cc drivers/input/serio/q40kbd.c
Simple merge

diff --cc drivers/macintosh/adbhid.c
Simple merge

diff --cc include/linux/input.h
Simple merge