]> git.baikalelectronics.ru Git - kernel.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)
commit3260737d9f7682742f0dd817931d1c04d4b99580
treeff51c2b3f7625ae8d89b45962cc3dbc59a5152f8
parent034f0966d2c8e2283a619fb59556d6579cd4cb12
parent725fd616d7be0d6b1d1d07094bb387679ffe6260
Merge branch 'next' into for-linus

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