Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
authorArnd Bergmann <arnd@arndb.de>
Fri, 5 Sep 2014 20:24:48 +0000 (22:24 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 5 Sep 2014 20:24:48 +0000 (22:24 +0200)
commit046ed3cc8886cd7f5e06cfa22e9d7c3e30873a1e
tree81b7fb9ae2bb0cf91a53be783c12f3efcca4454f
parentd5f97a2ce9a9fc8ef3fdb366b01c8b4d2d38332a
parent464d6e18639c4347dafd8dbcee270674dd3d8fba
Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt

Merge "First batch of AT91 DT material for 3.18" from Nicolas Ferre:

- RAM controller rework for multiple controller SoCs
- shutdown controller addtion

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
  ARM: at91/dt: sama5d3: Add shutdown controller
  ARM: at91/dt: Declare a second ram controller when relevant
  ARM: at91/dt: at91sam9: use ddrck in ramc
  ARM: at91/dt: sama5d3: define mpddr clock and ramc clocks