Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

diff --cc Documentation/powerpc/dts-bindings/fsl/mpc5200.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/include/asm/hvcall.h
Simple merge

diff --cc arch/powerpc/kernel/exceptions-64s.S
index fc3ead066cec8c8ba61e1312785e3aabfc98d5a4,c7eb4e0eb86cae27f3fcd510519d5177b124fa5e..e3be98ffe2a7246a37f280b8755e0d3d3117e24d
--- 1/arch/powerpc/kernel/exceptions-64s.S
--- 2/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@@ -190,16 -185,16 +190,19 @@@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE
         * prolog code of the PerformanceMonitor one. A little
         * trickery is thus necessary
         */
+ performance_monitor_pSeries_1:
        . = 0xf00
 +      DO_KVM  0xf00
        b       performance_monitor_pSeries
  
+ altivec_unavailable_pSeries_1:
        . = 0xf20
 +      DO_KVM  0xf20
        b       altivec_unavailable_pSeries
  
+ vsx_unavailable_pSeries_1:
        . = 0xf40
 +      DO_KVM  0xf40
        b       vsx_unavailable_pSeries
  
  #ifdef CONFIG_CBE_RAS

diff --cc arch/powerpc/kernel/irq.c
Simple merge

diff --cc arch/powerpc/kernel/setup_64.c
Simple merge

diff --cc arch/powerpc/kernel/time.c
Simple merge

diff --cc arch/powerpc/kernel/traps.c
Simple merge

diff --cc arch/powerpc/kvm/powerpc.c
Simple merge

diff --cc drivers/ata/Kconfig
Simple merge

diff --cc drivers/ata/Makefile
Simple merge

diff --cc include/linux/kvm.h
index caf6173bd2e8a34c9435b6ab33c35186d7abc6b5,2d241da07236fd10b8e3ad5b8e8df415a95bb9ef..a24de0b1858e9ad6080a353c4594cb5c3804703d
--- 1/include/linux/kvm.h
--- 2/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@@ -436,9 -487,15 +487,16 @@@ struct kvm_ioeventfd 
  #endif
  #define KVM_CAP_IOEVENTFD 36
  #define KVM_CAP_SET_IDENTITY_MAP_ADDR 37
- /* KVM upstream has more features, but we synched this number.
-    Linux, please remove this comment on rebase. */
+ #ifdef __KVM_HAVE_XEN_HVM
+ #define KVM_CAP_XEN_HVM 38
+ #endif
+ #define KVM_CAP_ADJUST_CLOCK 39
+ #define KVM_CAP_INTERNAL_ERROR_DATA 40
+ #ifdef __KVM_HAVE_VCPU_EVENTS
+ #define KVM_CAP_VCPU_EVENTS 41
+ #endif
+ #define KVM_CAP_S390_PSW 42
 +#define KVM_CAP_PPC_SEGSTATE 43
  
  #ifdef KVM_CAP_IRQ_ROUTING
  

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge