Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 27 Mar 2012 07:27:10 +0000 (00:27 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 27 Mar 2012 07:27:10 +0000 (00:27 -0700)
Conflicts:
drivers/input/tablet/wacom_sys.c


Trivial merge