Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 3 insertions, 0 deletions

diff --git a/arch/arm/mach-pxa/e350.c b/arch/arm/mach-pxa/e350.c
index 08003627213..f50f055f572 100644
--- a/arch/arm/mach-pxa/e350.c
+++ b/arch/arm/mach-pxa/e350.c
@@ -56,6 +56,9 @@ static struct platform_device *devices[] __initdata = {
 
 static void __init e350_init(void)
 {
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
         eseries_register_clks();
         eseries_get_tmio_gpios();
         platform_add_devices(devices, ARRAY_SIZE(devices));