Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest

Conflicts:
	arch/arm/mach-shmobile/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/powerpc/boot/dts/mpc836x_rdk.dts b/arch/powerpc/boot/dts/mpc836x_rdk.dts
index bdf4459677b1..b6e9aec1d860 100644
--- a/arch/powerpc/boot/dts/mpc836x_rdk.dts
+++ b/arch/powerpc/boot/dts/mpc836x_rdk.dts
@@ -102,7 +102,7 @@
 
                 serial0: serial@4500 {
                         device_type = "serial";
-                        compatible = "ns16550";
+                        compatible = "fsl,ns16550", "ns16550";
                         reg = <0x4500 0x100>;
                         interrupts = <9 8>;
                         interrupt-parent = <&ipic>;
@@ -112,7 +112,7 @@
 
                 serial1: serial@4600 {
                         device_type = "serial";
-                        compatible = "ns16550";
+                        compatible = "fsl,ns16550", "ns16550";
                         reg = <0x4600 0x100>;
                         interrupts = <10 8>;
                         interrupt-parent = <&ipic>;