aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/exynos4210-trats.dts
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-29 12:04:39 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-29 12:04:39 -0400
commitb472b8e22f9f9bc88dc73017d61609684289fb13 (patch)
treecbb2ec0c2fd2cf6d9f4d2e323e97aa757bd93c59 /arch/arm/boot/dts/exynos4210-trats.dts
parentd124a60dbbe7c12f3871e2c7fc71f98a821ee9a8 (diff)
parent8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff)
Merge 3.7-rc3 into usb-next.
This pulls in all of the USB changes in 3.7-rc3 into usb-next and resolves the merge issue with: drivers/usb/misc/ezusb.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/exynos4210-trats.dts')
-rw-r--r--arch/arm/boot/dts/exynos4210-trats.dts6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index 73567b843e72..a21511c14071 100644
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -20,8 +20,10 @@
20 compatible = "samsung,trats", "samsung,exynos4210"; 20 compatible = "samsung,trats", "samsung,exynos4210";
21 21
22 memory { 22 memory {
23 reg = <0x40000000 0x20000000 23 reg = <0x40000000 0x10000000
24 0x60000000 0x20000000>; 24 0x50000000 0x10000000
25 0x60000000 0x10000000
26 0x70000000 0x10000000>;
25 }; 27 };
26 28
27 chosen { 29 chosen {