From: Arnd Bergmann Date: Fri, 28 Nov 2014 22:24:12 +0000 (+0100) Subject: Merge tag 'omap-for-v3.19/gpmc-move-v2' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: firefly_0821_release~176^2~2765^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1306b20daa38c1429dabacc9ec8b437cb585e427;p=firefly-linux-kernel-4.4.55.git Merge tag 'omap-for-v3.19/gpmc-move-v2' of git://git./linux/kernel/git/tmlind/linux-omap into next/omap-gpmc Pull "move omap gpmc to drivers finally" from Tony Lindgren: We can finally move the GPMC code to live in drivers/memory for further clean up work. Note that we still have dependencies to the legacy booting for omap3 board-*.c files for setting up the board specific memory timings. For that we need the timing related things still exposed in include/linux/omap-gpmc.h. This will all become private data to the GPMC driver once the legacy booting support can be dropped. * tag 'omap-for-v3.19/gpmc-move-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: memory: gpmc: Move omap gpmc code to live under drivers ARM: OMAP2+: Move GPMC initcall to devices.c ARM: OMAP2+: Prepare to move GPMC to drivers by platform data header Signed-off-by: Arnd Bergmann --- 1306b20daa38c1429dabacc9ec8b437cb585e427