Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 20 Mar 2012 00:02:01 +0000 (17:02 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 20 Mar 2012 00:02:01 +0000 (17:02 -0700)
commit10ce3cc919f50c2043b41ca968b43c26a3672600
treeea409366a5208aced495bc0516a08b81fd43222e
parent24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd
parent5c6a7a62c130afef3d61c1dee153012231ff5cd9
Merge branch 'next' into for-linus
drivers/input/evdev.c
drivers/input/tablet/wacom_sys.c
drivers/input/tablet/wacom_wac.c