From: Arnd Bergmann Date: Wed, 2 Mar 2016 16:33:56 +0000 (+0100) Subject: Merge tag 'gpmc-omap-for-v4.6' of https://github.com/rogerq/linux into next/drivers X-Git-Tag: v4.6-rc1~71^2~1 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9d6c3eb811fce4b3f470fd853165928841527d7c;p=linux.git Merge tag 'gpmc-omap-for-v4.6' of https://github.com/rogerq/linux into next/drivers 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 --- 9d6c3eb811fce4b3f470fd853165928841527d7c