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)
Bring in changes to ads7846 to avoid mereg conflicts.

1  2 
drivers/input/input-mt.c

Simple merge