]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 13 Oct 2007 01:27:47 +0000 (21:27 -0400)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 13 Oct 2007 01:27:47 +0000 (21:27 -0400)
commit5e7f20d1cf7ac8049e70f38cfc53c1b9ffd2ce4e
treee292dc07b22308912cf6a58354a608b9e5e8e1fd
parent96e661c53c5209162ad3dcfd742232f148878aae
parentfcb700c9466947f0c00b034ce480a2ef489c5114
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

drivers/macintosh/adbhid.c
12 files changed:
drivers/hwmon/Kconfig
drivers/hwmon/applesmc.c
drivers/input/evdev.c
drivers/input/input.c
drivers/input/keyboard/gpio_keys.c
drivers/input/mouse/lifebook.c
drivers/input/serio/i8042.c
drivers/input/touchscreen/usbtouchscreen.c
drivers/macintosh/Kconfig
drivers/macintosh/adbhid.c
include/linux/input.h
include/linux/keyboard.h