Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 24 May 2011 07:06:26 +0000 (00:06 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 24 May 2011 07:06:26 +0000 (00:06 -0700)
commitb73077eb03f510a84b102fb97640e595a958403c
tree8b639000418e2756bf6baece4e00e07d2534bccc
parent28350e330cfab46b60a1dbf763b678d859f9f3d9
parent9d2e173644bb5c42ff1b280fbdda3f195a7cf1f7
Merge branch 'next' into for-linus
drivers/input/touchscreen/ads7846.c
include/linux/mfd/wm831x/pdata.h