]> Git Repo - linux.git/commitdiff
Merge tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh...
authorArnd Bergmann <[email protected]>
Fri, 23 May 2014 16:49:25 +0000 (18:49 +0200)
committerArnd Bergmann <[email protected]>
Fri, 23 May 2014 19:58:10 +0000 (21:58 +0200)
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 <[email protected]>

Trivial merge
This page took 0.058069 seconds and 4 git commands to generate.