]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d8dc3e 9a3c414)
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 patch | diff1 | diff2 | blob | history
drivers/input/keyboard/Kconfig patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/input/keyboard/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.