Merge commit 'v3.6-rc5' into next
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 13 Sep 2012 14:41:01 +0000 (08:41 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 13 Sep 2012 14:41:01 +0000 (08:41 -0600)
commit78890b5989d96ddce989cde929c45ceeded0fcaf
tree4e2da81fc7c97f11aee174b1eedac110c9a68b3a
parent1959ec5f82acbdf91425b41600f119ebecb5f6a8
parent55d512e245bc7699a8800e23df1a24195dd08217
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
15 files changed:
Documentation/feature-removal-schedule.txt
drivers/gpu/drm/radeon/evergreen.c
drivers/iommu/intel-iommu.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/wireless/ath/ath9k/pci.c
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/pci/pci.c
drivers/pci/pcie/portdrv_pci.c
drivers/pci/probe.c
drivers/rapidio/devices/tsi721.c
drivers/xen/xen-pciback/pci_stub.c