]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh...
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 16:49:25 +0000 (18:49 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 19:58:10 +0000 (21:58 +0200)
commitdf4921ae3e41614171ddc81ef438137a23c576e4
tree43bb4bb94bdf3d1ea2965282a66da8586c15405b
parent8272cd28e741b2532cb0662c5126f36a3a0a2643
parent1e6f5b427a08a5de2d050ca83ba0d7bfc8e0661e
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 <arnd@arndb.de>