]> git.karo-electronics.de Git - linux-beck.git/commit
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)
commit993808253ca256b8ca7f8ff90d9935d7c99cd32d
treeff51c2b3f7625ae8d89b45962cc3dbc59a5152f8
parent10ce3cc919f50c2043b41ca968b43c26a3672600
parent131c713fd96e251fcb18f4d2d05f263aa41bb11f
Merge branch 'next' into for-linus

Conflicts:
drivers/input/tablet/wacom_sys.c
drivers/input/tablet/Kconfig
drivers/input/tablet/wacom_wac.c