Arnd Bergmann 421b759b86 Merge branch 'samsung/cleanup' into next/boards ... Conflicts: arch/arm/mach-imx/mach-imx6q.c arch/arm/mach-omap2/board-ti8168evm.c arch/arm/mach-s3c64xx/Kconfig arch/arm/mach-tegra/Makefile arch/arm/mach-tegra/board-dt-tegra20.c arch/arm/mach-tegra/common.c Lots of relatively simple conflicts between the board changes and stuff from the arm tree. This pulls in the resolution from the samsung/cleanup tree, so we don't get conflicting merges. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-09 17:06:36 +00:00
..
omap	arm/dts: OMAP3+: Add mpu, dsp and iva nodes	2011-10-04 22:29:40 +02:00
arm-boards	arm/versatile: Add device tree support	2011-07-28 01:32:04 -06:00
calxeda.txt	ARM: highbank: add devicetree source	2011-10-31 14:13:58 +01:00
fsl.txt	arm/imx6q: Rename Sabreauto to Armadillo2	2011-12-14 21:25:46 +08:00
gic.txt	ARM: gic: allow GIC to support non-banked setups	2011-11-15 18:13:03 +00:00
insignal-boards.txt	ARM: EXYNOS: Add Exynos4 device tree enabled board file	2011-12-23 10:07:11 +09:00
l2cc.txt	ARM: 7023/1: L2x0: Add interrupts property to OF binding	2011-10-17 09:11:44 +01:00
picoxcell.txt	picoxcell: support for Picochip picoxcell devices	2011-09-26 16:11:56 +01:00
pmu.txt
primecell.txt	Devicetree: Expand on ARM Primecell binding documentation	2011-10-24 23:48:01 +02:00
samsung-boards.txt	ARM: EXYNOS: Add Exynos4 device tree enabled board file	2011-12-23 10:07:11 +09:00
sirf.txt
tegra.txt	arm/tegra: initial device tree for tegra30	2011-12-17 16:14:49 -08:00
vic.txt	ARM: vic: device tree binding	2011-11-15 18:14:02 +00:00
xilinx.txt