summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-07-06 18:00:32 +0200
committerArnd Bergmann <arnd@arndb.de>2016-07-06 18:00:32 +0200
commit7c2d780ec018812333fa726c42acc34cc0be1426 (patch)
tree39332a150f6457fb6137930e157eff907d021e99 /.mailmap
parentARM: clps711x: Switch to MULTIPLATFORM (diff)
parentARM: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB (diff)
downloadlinux-7c2d780ec018812333fa726c42acc34cc0be1426.tar.xz
linux-7c2d780ec018812333fa726c42acc34cc0be1426.zip
Merge ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB changes into next/soc
* commit '5c34a4e89c743339f78cafb2f2a826a010f0746a': ARM: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB ARM: uniphier: drop code for old DT binding These cause a harmless conflict with the clps711x multiplatform support, and it's easy to resolve. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions