Bjorn Helgaas 9a5d5bd848 Merge commit 'v3.6-rc5' into pci/gavin-window-alignment ... * 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 15:54:57 -06:00
..
boot	powerpc/p4080ds: dts - add usb controller version info and port0	2012-08-10 07:47:02 -05:00
configs	Revert "powerpc: Update g5_defconfig"	2012-08-24 20:55:55 +10:00
include/asm	Merge commit 'v3.6-rc5' into pci/gavin-window-alignment	2012-09-13 15:54:57 -06:00
kernel	Merge commit 'v3.6-rc5' into pci/gavin-window-alignment	2012-09-13 15:54:57 -06:00
kvm	ppc: e500_tlb memset clears nothing	2012-08-16 14:14:53 +02:00
lib	powerpc: Don't use __put_user() in patch_instruction	2012-09-05 16:05:23 +10:00
math-emu
mm	powerpc/vphn: Fix arch_update_cpu_topology() return value	2012-09-05 16:05:19 +10:00
net	powerpc: Start using ___PPC_RA/B/S/T where necessary	2012-07-10 19:18:25 +10:00
oprofile	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
perf	powerpc/perf: Use pmc_overflow() to detect rolled back events	2012-08-24 20:26:10 +10:00
platforms	Merge commit 'v3.6-rc5' into pci/gavin-window-alignment	2012-09-13 15:54:57 -06:00
sysdev	powerpc: Make sure IPI handlers see data written by IPI senders	2012-09-05 16:05:22 +10:00
xmon	powerpc: Fixup whitespace in xmon	2012-08-24 20:26:03 +10:00
Kconfig	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	2012-07-30 17:25:21 -07:00
Kconfig.debug	powerpc: IOMMU fault injection	2012-07-10 19:18:59 +10:00
Makefile	crypto: nx - move nx build to driver/crypto Makefile	2012-06-27 14:42:00 +08:00
relocs_check.pl	powerpc: Process dynamic relocations for kernel	2011-12-20 10:21:08 -05:00