Merge branch 'for-linus' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 24 Nov 2012 08:02:54 +0000 (00:02 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 24 Nov 2012 08:02:54 +0000 (00:02 -0800)
commit5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1
treec5aa57e70d901ae05b25e61387a351e6b0b2826b
parent037db524a2015607031c70a7935153120601b908
parent0a0d62857366d8a6531e7fed1c3ccdd9a2b5b40b
Merge branch 'for-linus' into next

Bring in changes to ads7846 to avoid mereg conflicts.
drivers/input/input-mt.c