Merge remote-tracking branch 'upstream/master' into queue
authorMarcelo Tosatti <mtosatti@redhat.com>
Sun, 26 Aug 2012 16:58:41 +0000 (13:58 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Sun, 26 Aug 2012 16:58:41 +0000 (13:58 -0300)
commitc78aa4c4b94b5b148be576a9f1570e31fe282b46
tree6d5801eb3e60bcec6a91c7b13a334c6d2ea11b05
parent90993cdd1800dc6ef9587431a0c625b978584e81
parent9acb172543aecb783e2e1e53e3f447d4c0f5c150
Merge remote-tracking branch 'upstream/master' into queue

Merging critical fixes from upstream required for development.

* upstream/master: (809 commits)
  libata: Add a space to " 2GB ATA Flash Disk" DMA blacklist entry
  Revert "powerpc: Update g5_defconfig"
  powerpc/perf: Use pmc_overflow() to detect rolled back events
  powerpc: Fix VMX in interrupt check in POWER7 copy loops
  powerpc: POWER7 copy_to_user/copy_from_user patch applied twice
  powerpc: Fix personality handling in ppc64_personality()
  powerpc/dma-iommu: Fix IOMMU window check
  powerpc: Remove unnecessary ifdefs
  powerpc/kgdb: Restore current_thread_info properly
  powerpc/kgdb: Bail out of KGDB when we've been triggered
  powerpc/kgdb: Do not set kgdb_single_step on ppc
  powerpc/mpic_msgr: Add missing includes
  powerpc: Fix null pointer deref in perf hardware breakpoints
  powerpc: Fixup whitespace in xmon
  powerpc: Fix xmon dl command for new printk implementation
  xfs: check for possible overflow in xfs_ioc_trim
  xfs: unlock the AGI buffer when looping in xfs_dialloc
  xfs: fix uninitialised variable in xfs_rtbuf_get()
  powerpc/fsl: fix "Failed to mount /dev: No such device" errors
  powerpc/fsl: update defconfigs
  ...

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
arch/powerpc/include/asm/kvm_host.h
arch/powerpc/kvm/e500_tlb.c
arch/x86/kvm/emulate.c
arch/x86/kvm/mmu.c