Arnd Bergmann b001befe58 Merge branch 'samsung/dt' into next/dt ... * samsung/dt: (3 commit) Merge branch 'depends/rmk/for-linus' into samsung/dt Merge branch 'depends/rmk/restart' into next/cleanup Merge branch 'next/cleanup' into samsung/dt Conflicts: arch/arm/mach-tegra/board-dt.c arch/arm/mach-tegra/include/mach/entry-macro.S The latest version of the samsung/dt branch resolves all sorts of conflicts with the latest upstream, no functional changes that are not already there. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-07 20:40:51 +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	Merge branch 'imx/imx6q' into next/soc	2011-11-02 02:46:55 +01: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	ARM: CSR: Adding CSR SiRFprimaII board support	2011-07-09 07:19:28 +08:00
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