From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 18 Mar 2013 16:16:37 +0000 (+0100)
Subject: Merge branch 'prima2/soc' into next/soc
X-Git-Tag: next-20130320~13^2^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=54fb32c06e8edce48dd4fa02d5afeb3609fc642c;p=karo-tx-linux.git

Merge branch 'prima2/soc' into next/soc

From Barry Song <Barry.Song@csr.com>:

SiRFatlas6 is much similar with SiRFprimaII with some changes about:
1. deleted l2 cache, sdmmc4, multimedia and so on
2. changed pinmux layout and clock layout
3. DMA access limitation disappears, that makes us not need DMA_ZONE
   on atlas6

* prima2/soc:
  ARM/dts: prima2: add .dtsi for atlas6 and .dts for atla6-evb board
  arm: prima2: add new SiRFatlas6 machine in common board

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

54fb32c06e8edce48dd4fa02d5afeb3609fc642c