tree ff51c2b3f7625ae8d89b45962cc3dbc59a5152f8
parent 10ce3cc919f50c2043b41ca968b43c26a3672600
parent 131c713fd96e251fcb18f4d2d05f263aa41bb11f
author Dmitry Torokhov <dmitry.torokhov@gmail.com> 1332833230 -0700
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> 1332833230 -0700

Merge branch 'next' into for-linus

Conflicts:
	drivers/input/tablet/wacom_sys.c