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

Conflicts:

	drivers/macintosh/adbhid.c

diff --cc drivers/hwmon/Kconfig
Simple merge

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

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

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

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

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

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

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

diff --cc drivers/macintosh/Kconfig
Simple merge

diff --cc drivers/macintosh/adbhid.c
index 9ff2189d2e2a3d3d28e91f28f4857816cf852b0a,48d17bf6c927d6e8b528c48758b7c309d4c2773f..8cce016b3d0936ce2cbdb2c2e7a348c137f7cfab
--- 1/drivers/macintosh/adbhid.c
--- 2/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@@ -334,7 -296,7 +334,7 @@@ adbhid_input_keycode(int id, int scanco
                        keycode = ADB_KEY_POWER;
                }
                break;
--      case ADB_KEY_POWER: 
++      case ADB_KEY_POWER:
                /* Fn + Command will produce a bogus "power" keycode */
                if (ahid->flags & FLAG_FN_KEY_PRESSED) {
                        keycode = ADB_KEY_CMD;

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

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