Merge commit 'http://github.com/rogerq/linux gpmc-omap-v4.8-rc1' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Fri, 2 Sep 2016 22:52:11 +0000 (00:52 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 2 Sep 2016 22:52:11 +0000 (00:52 +0200)
commit9064a1c77dd3a5c7288b0254a336d6f4073cd996
tree18d84e2dabc88c0882c2f6cf7e3ce2d8ac17d312
parent7d3ef43f1f99d4250ff120c8965b3e5cd81b3c71
parent23540d6e2f3193b946c4de43e3f9654fa6d23fe7
Merge commit 'github.com/rogerq/linux gpmc-omap-v4.8-rc1' into next/drivers

This is also going to be part of v4.8 and sent as a bugfix,
merging it here to avoid a small conflict against the other
gpmc changes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
drivers/memory/omap-gpmc.c