Merge branch 'for-linus' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 18 Oct 2010 04:20:19 +0000 (21:20 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 18 Oct 2010 04:20:19 +0000 (21:20 -0700)
commit3136baf8d09458bb04332b81494fd13ad90fe94a
tree6593ef5894597bf6224cf0374e4d49b1499d347d
parent1d02ad436235080b8a95a2c86a66cb7b8f2e9df9
parentca047fedd89bbb4b79b61e0656a7b799e4e45e6d
Merge branch 'for-linus' into next
drivers/input/serio/i8042.c
drivers/input/tablet/wacom_sys.c
drivers/input/tablet/wacom_wac.c