Merge branch 'x86/trampoline' into x86/urgent

x86/trampoline contains an urgent commit which is necessarily on a
newer baseline.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 1 insertions, 5 deletions

diff --git a/arch/arm/boot/dts/imx53-ard.dts b/arch/arm/boot/dts/imx53-ard.dts
index 2dccce46ed81..5b8eafcdbeec 100644
--- a/arch/arm/boot/dts/imx53-ard.dts
+++ b/arch/arm/boot/dts/imx53-ard.dts
@@ -17,10 +17,6 @@
         model = "Freescale i.MX53 Automotive Reference Design Board";
         compatible = "fsl,imx53-ard", "fsl,imx53";
 
-        chosen {
-                bootargs = "console=ttymxc0,115200 root=/dev/mmcblk0p3 rootwait";
-        };
-
         memory {
                 reg = <0x70000000 0x40000000>;
         };
@@ -44,7 +40,7 @@
                                 reg = <0x53fa8000 0x4000>;
                         };
 
-                        uart1: uart@53fbc000 {
+                        uart1: serial@53fbc000 {
                                 status = "okay";
                         };
                 };