]> nv-tegra.nvidia Code Review - linux-2.6.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)
commitb981d8b3f5e008ff10d993be633ad00564fc22cd
treee292dc07b22308912cf6a58354a608b9e5e8e1fd
parentb11d2127c4893a7315d1e16273bc8560049fa3ca
parent2b9e0aae1d50e880c58d46788e5e3ebd89d75d62
Merge /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