]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
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)
Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.

1  2 
MAINTAINERS
drivers/input/keyboard/Kconfig

diff --cc MAINTAINERS
Simple merge
Simple merge