Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 11 Oct 2012 07:45:21 +0000 (00:45 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 11 Oct 2012 07:45:21 +0000 (00:45 -0700)
commit0cc8d6a9d23d6662da91eeb6bb8e7d1c559850f0
tree7187a6807ff5bd6e8f8dac7c53e2de28759a8354
parentdde3ada3d0069855eeb353707b2b0f946191cfd6
parent7f8d4cad1e4e11a45d02bd6e024cc2812963c38a
Merge branch 'next' into for-linus

Prepare second set of updates for 3.7 merge window (Wacom driver update
and patches extending number of input minors).
drivers/input/mouse/sentelic.c
drivers/input/mouse/synaptics.c
drivers/input/tablet/wacom_wac.c
drivers/input/touchscreen/edt-ft5x06.c