linux/arch/powerpc/platforms
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
..
8xx Disintegrate asm/system.h for PowerPC 2012-03-28 18:30:02 +01:00
40x Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-01-08 13:21:22 -08:00
44x powerpc: Fix assmption of end_of_DRAM() returns end address 2012-07-03 14:14:49 +10:00
52xx powerpc: Mark const init data with __initconst instead of __initdata 2012-04-02 14:00:03 +10:00
82xx powerpc/82xx: add SPI support for mgcoge 2012-07-10 07:07:20 -05:00
83xx powerpc/83xx: fix RGMII AC values workaround for km83xx 2012-07-10 07:07:20 -05:00
85xx Merge remote-tracking branch 'kumar/merge' into merge 2012-07-31 15:18:31 +10:00
86xx PCI changes for the 3.6 merge window: 2012-07-24 16:17:07 -07:00
512x irq_domain/powerpc: constify irq_domain_ops 2012-02-16 06:11:24 -07:00
amigaone pcspkr: Cleanup Kconfig dependencies 2011-06-09 15:01:41 +02:00
cell Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2012-08-01 10:26:23 -07:00
chrp powerpc/mpic: Remove duplicate MPIC_WANTS_RESET flag 2012-02-23 10:50:00 +11:00
embedded6xx Disintegrate asm/system.h for PowerPC 2012-03-28 18:30:02 +01:00
maple Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
pasemi Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
powermac Merge branch 'merge' into next 2012-05-09 10:57:57 +10:00
powernv Merge commit 'v3.6-rc5' into next 2012-09-13 08:41:01 -06:00
prep powerpc: drop unused Kconfig symbols 2011-10-31 23:39:52 +01:00
ps3 powerpc/ps3: Minor Kconfig cleanup 2012-04-24 15:34:19 -07:00
pseries PCI changes for the 3.6 merge window: 2012-07-24 16:17:07 -07:00
wsp Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
fsl_uli1575.c Disintegrate asm/system.h for PowerPC 2012-03-28 18:30:02 +01:00
Kconfig KVM: PPC: Factor out guest epapr initialization 2012-05-30 11:43:10 +02:00
Kconfig.cputype powerpc/e500: add paravirt QEMU platform 2012-07-11 07:49:36 -05:00
Makefile powerpc: Remove the main legacy iSerie platform code 2012-03-09 10:35:11 +11:00