Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes

diff --cc drivers/input/keyboard/Kconfig
Simple merge

diff --cc drivers/input/keyboard/qt2160.c
Simple merge

diff --cc drivers/input/touchscreen/edt-ft5x06.c
Simple merge

diff --cc drivers/input/touchscreen/wm831x-ts.c
Simple merge