Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/arch/arm/boot/dts
History
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
..
at91sam9g20.dtsi ARM: at91: add at91sam9g20 and Calao USB A9G20 DT support 2011-10-25 13:08:31 +02:00
at91sam9g45.dtsi ARM: at91: dt: at91sam9g45 family and board device tree files 2011-10-25 13:08:21 +02:00
at91sam9m10g45ek.dts ARM: at91: dt: at91sam9g45 family and board device tree files 2011-10-25 13:08:21 +02:00
exynos4210-origen.dts ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN 2011-12-23 10:07:12 +09:00
exynos4210-smdkv310.dts ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN 2011-12-23 10:07:12 +09:00
exynos4210.dtsi ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN 2011-12-23 10:07:12 +09:00
highbank.dts ARM: highbank: add devicetree source 2011-10-31 14:13:58 +01:00
imx6q-arm2.dts arm/imx6q: Rename Sabreauto to Armadillo2 2011-12-14 21:25:46 +08:00
imx6q-sabrelite.dts arm/imx6: add imx6q sabrelite board support 2011-12-14 21:25:45 +08:00
imx6q.dtsi dts/imx: rename uart labels to consistent with hw spec 2011-12-14 21:25:44 +08:00
imx51-babbage.dts dts/imx: rename uart labels to consistent with hw spec 2011-12-14 21:25:44 +08:00
imx51.dtsi dts/imx: rename uart labels to consistent with hw spec 2011-12-14 21:25:44 +08:00
imx53-ard.dts dts/imx: rename uart labels to consistent with hw spec 2011-12-14 21:25:44 +08:00
imx53-evk.dts dts/imx: rename uart labels to consistent with hw spec 2011-12-14 21:25:44 +08:00
imx53-qsb.dts dts/imx: rename uart labels to consistent with hw spec 2011-12-14 21:25:44 +08:00
imx53-smd.dts dts/imx: rename uart labels to consistent with hw spec 2011-12-14 21:25:44 +08:00
imx53.dtsi dts/imx: rename uart labels to consistent with hw spec 2011-12-14 21:25:44 +08:00
msm8660-surf.dts ARM: msm: Add devicetree support for msm8660-surf 2011-08-29 12:47:36 -07:00
omap3-beagle.dts arm/dts: Add support for OMAP3 Beagle board 2011-10-04 22:27:03 +02:00
omap3.dtsi arm/dts: OMAP3+: Add mpu, dsp and iva nodes 2011-10-04 22:29:40 +02:00
omap4-panda.dts arm/dts: Add support for OMAP4 PandaBoard 2011-10-04 22:26:59 +02:00
omap4-sdp.dts arm/dts: Add support for OMAP4 SDP board 2011-10-04 22:27:01 +02:00
omap4.dtsi arm/dts: OMAP3+: Add mpu, dsp and iva nodes 2011-10-04 22:29:40 +02:00
picoxcell-pc3x2.dtsi picoxcell: add the DTS for pc3x2 and pc3x3 devices 2011-09-26 16:12:06 +01:00
picoxcell-pc3x3.dtsi picoxcell: add the DTS for pc3x2 and pc3x3 devices 2011-09-26 16:12:06 +01:00
picoxcell-pc7302-pc3x2.dts picoxcell: add the DTS for the PC7302 board 2011-09-26 16:12:07 +01:00
picoxcell-pc7302-pc3x3.dts picoxcell: add the DTS for the PC7302 board 2011-09-26 16:12:07 +01:00
prima2-cb.dts ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII 2011-10-24 02:54:21 -07:00
skeleton.dtsi
tegra-cardhu.dts arm/tegra: add support for tegra30 based board cardhu 2011-12-17 20:15:38 -08:00
tegra-harmony.dts arm/dt: tegra: Fix SDHCI nodes to match board files 2011-12-07 20:48:06 -08:00
tegra-paz00.dts arm/tegra: convert tegra20 to GIC devicetree binding 2011-12-07 21:20:12 -08:00
tegra-seaboard.dts arm/dt: tegra: Fix SDHCI nodes to match board files 2011-12-07 20:48:06 -08:00
tegra-trimslice.dts arm/dt: tegra: Fix SDHCI nodes to match board files 2011-12-07 20:48:06 -08:00
tegra-ventana.dts arm/dt: tegra: Fix SDHCI nodes to match board files 2011-12-07 20:48:06 -08:00
tegra20.dtsi arm/tegra: convert tegra20 to GIC devicetree binding 2011-12-07 21:20:12 -08:00
tegra30.dtsi arm/tegra: initial device tree for tegra30 2011-12-17 16:14:49 -08:00
usb_a9g20.dts ARM: at91: add at91sam9g20 and Calao USB A9G20 DT support 2011-10-25 13:08:31 +02:00
versatile-ab.dts arm/versatile: Add device tree support 2011-07-28 01:32:04 -06:00
versatile-pb.dts arm/versatile: Add device tree support 2011-07-28 01:32:04 -06:00
zynq-ep107.dts