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/csb726.c b/arch/arm/mach-pxa/csb726.c
index 965480eb4fe..88575b87bd3 100644
--- a/arch/arm/mach-pxa/csb726.c
+++ b/arch/arm/mach-pxa/csb726.c
@@ -268,6 +268,9 @@ static void __init csb726_init(void)
 /*      MSC2 = 0x06697ff4; *//* none/SM501 */
         MSC2 = (MSC2 & ~0xffff) | 0x7ff4; /* SM501 */
 
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
         pxa_set_i2c_info(NULL);
         pxa27x_set_i2c_power_info(NULL);
         pxa_set_mci_info(&csb726_mci);