Merge remote-tracking branch 'xen-tip/linux-next'

Conflicts:
	arch/arm/include/asm/xen/page.h

diff --cc arch/arm/include/asm/xen/page.h
index 3759cacdd7f8601322b98ffed6598d97ee8bd016,709c4b4d2f1dbaa60a5a5b701ab65b04606b4868..e0965abacb7d37e7a8bc5b1f9f072ea299839cd6
--- 1/arch/arm/include/asm/xen/page.h
--- 2/arch/arm/include/asm/xen/page.h
+++ b/arch/arm/include/asm/xen/page.h
@@@ -117,6 -117,7 +117,7 @@@ static inline bool set_phys_to_machine(
        return __set_phys_to_machine(pfn, mfn);
  }
  
- #define xen_remap(cookie, size) ioremap_cache((cookie), (size));
 -#define xen_remap(cookie, size) ioremap_cached((cookie), (size))
++#define xen_remap(cookie, size) ioremap_cache((cookie), (size))
+ #define xen_unmap(cookie) iounmap((cookie))
  
  #endif /* _ASM_ARM_XEN_PAGE_H */

diff --cc drivers/block/xen-blkfront.c
Simple merge

diff --cc drivers/char/tpm/xen-tpmfront.c
Simple merge

diff --cc drivers/net/xen-netfront.c
Simple merge

diff --cc drivers/pci/xen-pcifront.c
Simple merge

diff --cc drivers/xen/Kconfig
Simple merge