diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 11:08:40 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 12:21:17 +0100 |
| commit | 0f4d5641a65b4a8428a4b9a7ad6f0ed580863e19 (patch) | |
| tree | 1a21edd7844f8cf3993fe0e94f7e460c8b4d9e06 /arch/ia64/scripts | |
| parent | Merge tag 'mvebu-dt-3.15-4' of git://git.infradead.org/linux-mvebu into next/dt (diff) | |
| parent | ARM: mvebu: Enable NAND controller in Armada 385-DB (diff) | |
| download | linux-0f4d5641a65b4a8428a4b9a7ad6f0ed580863e19.tar.xz linux-0f4d5641a65b4a8428a4b9a7ad6f0ed580863e19.zip | |
Merge tag 'mvebu-dt-3.15-5' of git://git.infradead.org/linux-mvebu into next/dt
Merge "mvebu dt changes for v3.15 (incremental #5)" from Jason Cooper:
- mvebu
- 38x
- add 2GHz fixed clock, core divider clock, and nand controller
- 385
- add nand controller and partitions to 385-DB board
* tag 'mvebu-dt-3.15-5' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Enable NAND controller in Armada 385-DB
ARM: mvebu: Add support for NAND controller in Armada 38x SoC
ARM: mvebu: Add the Core Divider clock to Armada 38x SoCs
ARM: mvebu: Add a 2 GHz fixed-clock on Armada 38x SoCs
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/ia64/scripts')
0 files changed, 0 insertions, 0 deletions