linux/arch/powerpc/platforms/powernv
Bjorn Helgaas 78890b5989 Merge commit 'v3.6-rc5' into next
* commit 'v3.6-rc5': (1098 commits)
  Linux 3.6-rc5
  HID: tpkbd: work even if the new Lenovo Keyboard driver is not configured
  Remove user-triggerable BUG from mpol_to_str
  xen/pciback: Fix proper FLR steps.
  uml: fix compile error in deliver_alarm()
  dj: memory scribble in logi_dj
  Fix order of arguments to compat_put_time[spec|val]
  xen: Use correct masking in xen_swiotlb_alloc_coherent.
  xen: fix logical error in tlb flushing
  xen/p2m: Fix one-off error in checking the P2M tree directory.
  powerpc: Don't use __put_user() in patch_instruction
  powerpc: Make sure IPI handlers see data written by IPI senders
  powerpc: Restore correct DSCR in context switch
  powerpc: Fix DSCR inheritance in copy_thread()
  powerpc: Keep thread.dscr and thread.dscr_inherit in sync
  powerpc: Update DSCR on all CPUs when writing sysfs dscr_default
  powerpc/powernv: Always go into nap mode when CPU is offline
  powerpc: Give hypervisor decrementer interrupts their own handler
  powerpc/vphn: Fix arch_update_cpu_topology() return value
  ARM: gemini: fix the gemini build
  ...

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	drivers/rapidio/devices/tsi721.c
2012-09-13 08:41:01 -06:00
..
Kconfig powerpc/powernv: Basic support for OPAL 2011-09-20 16:09:50 +10:00
Makefile powerpc/powernv: PCI support for p7IOC under OPAL v2 2011-11-25 14:53:15 +11:00
opal-nvram.c powerpc/powernv: Add RTC and NVRAM support plus RTAS fallbacks 2011-09-20 16:09:57 +10:00
opal-rtc.c powerpc/powernv: Add RTC and NVRAM support plus RTAS fallbacks 2011-09-20 16:09:57 +10:00
opal-takeover.S powerpc: Merge STK_REG/PARAM/FRAMESIZE 2012-07-10 19:18:03 +10:00
opal-wrappers.S powerpc: Change LOAD_REG_ADDR to use real register names 2012-07-10 19:18:14 +10:00
opal.c powerpc/powernv: Machine check and other system interrupts 2011-09-20 16:10:03 +10:00
pci-ioda.c powerpc/powernv: I/O and memory alignment for P2P bridges 2012-09-11 16:59:47 -06:00
pci-p5ioc2.c powerpc/powernv: Display diag data on p7ioc EEH errors 2011-12-07 18:04:02 +11:00
pci.c Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 2012-03-23 14:02:12 -07:00
pci.h powerpc/powernv: Display diag data on p7ioc EEH errors 2011-12-07 18:04:02 +11:00
powernv.h powerpc/powernv: Add support for p5ioc2 PCI-X and PCIe 2011-09-20 16:10:04 +10:00
setup.c arch/powerpc/platforms/powernv/setup.c: included asm/xics.h twice 2012-02-27 11:33:59 +11:00
smp.c powerpc/powernv: Always go into nap mode when CPU is offline 2012-09-05 16:05:20 +10:00