Merge tag 'v3.16-rc6' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 24 Jul 2014 19:36:56 +0000 (12:36 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 24 Jul 2014 19:36:56 +0000 (12:36 -0700)
commitb9f12a5d97f652c77ef6803dccd0d40d1290f5be
tree8f58c8620ffef0d350a5ec022feda492a96b179a
parent9d8dc3e529a19e427fd379118acd132520935c5d
parent9a3c4145af32125c5ee39c0272662b47307a8323
Merge tag 'v3.16-rc6' into next

Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.
MAINTAINERS
drivers/input/keyboard/Kconfig