Merge tag 'gpmc-omap-for-v4.6' of https://github.com/rogerq/linux into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Wed, 2 Mar 2016 16:33:56 +0000 (17:33 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 2 Mar 2016 16:33:56 +0000 (17:33 +0100)
Merge "OMAP-GPMC: Add address/data muxed timings" from Roger Quadros:

* Add support for the GPMC Advanced AAD (address/data muxed) timings
on hardware supporting the feature like the AM335x and DM816X.

* tag 'gpmc-omap-for-v4.6' of https://github.com/rogerq/linux:
  dt-bindings: bus: ti-gpmc: Add AAD timings properties
  memory: omap-gpmc: Add support for AAD timings


Trivial merge