Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 30 Oct 2012 07:20:56 +0000 (00:20 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 30 Oct 2012 07:20:56 +0000 (00:20 -0700)
commit53279f36dccffc26ff536003fd6bb97cc21c3b82
tree9d16e497c0e4158c7c054c479bd0e9ff0388d7bb
parenta6e8c0a25377e27958b11b20e1927885ae7c9857
parent8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
drivers/input/keyboard/Kconfig
drivers/input/keyboard/qt2160.c
drivers/input/touchscreen/edt-ft5x06.c
drivers/input/touchscreen/wm831x-ts.c