From: Arnd Bergmann Date: Fri, 23 May 2014 16:49:25 +0000 (+0200) Subject: Merge tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh... X-Git-Tag: v3.16-rc1~43^2~3 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9f0f10117228b73ec657aab8f303c9ae88fda070;p=linux.git Merge tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/soc Keystone SOC updates for 3.16 - Drop unused COMMON_CLK_DEBUG option - Enable MTD_SPI_NOR config needed for M25P80 - Enable coherent higher address memory space * tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: keystone: Update the dma offset for non-dt platform devices ARM: keystone: Switch over to coherent memory address space ARM: configs: keystone: add MTD_SPI_NOR (new dependency for M25P80) ARM: configs: keystone: drop CONFIG_COMMON_CLK_DEBUG Signed-off-by: Arnd Bergmann --- 9f0f10117228b73ec657aab8f303c9ae88fda070