From: Arnd Bergmann Date: Sun, 22 Apr 2012 20:45:53 +0000 (+0200) Subject: Merge branch 'spear/dt' into next/dt X-Git-Tag: v3.5-rc1~154^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19f36bfa0021617ce07a79e186673d2da2258b60;p=platform%2Fkernel%2Flinux-exynos.git Merge branch 'spear/dt' into next/dt This is a rebased version of parts of git://git.stlinux.com/spear/linux-2.6.git spear-v3.5 which was accidentally based on the linux-next tree and mixed too many different things. The pinctrl related changes from the same branch are now in the spear/pinctrl branch of arm-soc. There are a few non-DT cleanups mixed in here, but fundamentally it's all related to the DT conversion. * spear/dt: (9 commits) ARM: spear: remove most mach/*.h header contents SPEAr: Update defconfigs SPEAr: Add PL080 DMA support for 3xx and 6xx ARM: SPEAr3xx: Add device-tree support to SPEAr3xx architecture SPEAr3xx: Replace printk() with pr_*() SPEAr6xx: Add compilation support for dtbs using 'make dtbs' SPEAr3xx: Add clock instance of usb hosts - ehci and ohci 0 and 1 SPEAr: Use CLKDEV_INIT for defining clk_lookups ARM: SPEAr600: Change FSMC and SMI clock names Signed-off-by: Arnd Bergmann [olof: rebuilt branch due to drop of an early merge] Signed-off-by: Olof Johansson --- 19f36bfa0021617ce07a79e186673d2da2258b60