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

Conflicts:
	arch/powerpc/kvm/timing.h

Signed-off-by: Avi Kivity <avi@redhat.com>

diff --cc arch/powerpc/kvm/timing.h
index a550f0ffeab18d76a5aea4b4bf142ebe4ed6c9c8,806ef67868bd8fc3ddd5ef314a35eaa3e8b35039..8167d42a776f08d9e1b5315c7b0a5a338a6ac011
--- 1/arch/powerpc/kvm/timing.h
--- 2/arch/powerpc/kvm/timing.h
+++ b/arch/powerpc/kvm/timing.h
@@@ -48,7 -48,11 +48,11 @@@ static inline void kvmppc_set_exit_type
  static inline void kvmppc_account_exit_stat(struct kvm_vcpu *vcpu, int type)
  {
        /* type has to be known at build time for optimization */
 -      BUILD_BUG_ON(__builtin_constant_p(type));
+ 
+       /* The BUILD_BUG_ON below breaks in funny ways, commented out
+        * for now ... -BenH
 +      BUILD_BUG_ON(!__builtin_constant_p(type));
+       */
        switch (type) {
        case EXT_INTR_EXITS:
                vcpu->stat.ext_intr_exits++;

diff --cc arch/x86/Kconfig
Simple merge