linux/arch/powerpc/kvm
Linus Torvalds 723e9db7a4 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (134 commits)
  powerpc/nvram: Enable use Generic NVRAM driver for different size chips
  powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline
  powerpc/ps3: Workaround for flash memory I/O error
  powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead
  powerpc/perf_counters: Reduce stack usage of power_check_constraints
  powerpc: Fix bug where perf_counters breaks oprofile
  powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops
  powerpc/irq: Improve nanodoc
  powerpc: Fix some late PowerMac G5 with PCIe ATI graphics
  powerpc/fsl-booke: Use HW PTE format if CONFIG_PTE_64BIT
  powerpc/book3e: Add missing page sizes
  powerpc/pseries: Fix to handle slb resize across migration
  powerpc/powermac: Thermal control turns system off too eagerly
  powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan()
  powerpc/405ex: support cuImage via included dtb
  powerpc/405ex: provide necessary fixup function to support cuImage
  powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC
  powerpc/44x: Add Eiger AMCC (AppliedMicro) PPC460SX evaluation board support.
  powerpc/44x: Update Arches defconfig
  powerpc/44x: Update Arches dts
  ...

Fix up conflicts in drivers/char/agp/uninorth-agp.c
2009-09-15 09:51:09 -07:00
..
44x.c KVM: powerpc: fix some init/exit annotations 2009-09-10 08:32:44 +03:00
44x_emulate.c KVM: ppc: split out common Book E instruction emulation 2009-03-24 11:02:57 +02:00
44x_tlb.c KVM: powerpc: convert marker probes to event trace 2009-09-10 08:33:03 +03:00
44x_tlb.h KVM: ppc: rename 44x MMU functions used in booke.c 2009-03-24 11:02:56 +02:00
booke.c KVM: powerpc: fix some init/exit annotations 2009-09-10 08:32:44 +03:00
booke.h KVM: ppc: Add extra E500 exceptions 2009-03-24 11:02:59 +02:00
booke_emulate.c KVM: ppc: Add dbsr in kvm_vcpu_arch 2009-03-24 11:02:57 +02:00
booke_interrupts.S powerpc: Use names rather than numbers for SPRGs (v2) 2009-08-20 10:12:27 +10:00
e500.c KVM: ppc: e500: Directly pass pvr to guest 2009-09-10 08:32:47 +03:00
e500_emulate.c KVM: ppc: e500: Add MMUCFG and PVR emulation 2009-09-10 08:32:47 +03:00
e500_tlb.c KVM: powerpc: convert marker probes to event trace 2009-09-10 08:33:03 +03:00
e500_tlb.h KVM: ppc: e500: Move to Book-3e MMU definitions 2009-09-10 08:32:47 +03:00
emulate.c KVM: powerpc: convert marker probes to event trace 2009-09-10 08:33:03 +03:00
Kconfig KVM: remove old KVMTRACE support code 2009-09-10 08:33:03 +03:00
Makefile KVM: remove old KVMTRACE support code 2009-09-10 08:33:03 +03:00
powerpc.c KVM: Reduce runnability interface with arch support code 2009-09-10 08:33:13 +03:00
timing.c KVM: ppc: mostly cosmetic updates to the exit timing accounting code 2008-12-31 16:55:41 +02:00
timing.h KVM: ppc: mostly cosmetic updates to the exit timing accounting code 2008-12-31 16:55:41 +02:00
trace.h KVM: powerpc: convert marker probes to event trace 2009-09-10 08:33:03 +03:00