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
..
alchemy	MIPS: MTX-1: Add udelay to mtx1_pci_idsel	2012-08-17 10:57:27 +02:00
ar7
ath79	MIPS: ath79: Use correct IRQ number for the OHCI controller on AR7240	2012-08-17 10:57:27 +02:00
bcm47xx	MIPS: BCM47xx: Fix BCMA_DRIVER_PCI_HOSTMODE config dependencies	2012-07-19 11:23:43 +02:00
bcm63xx	MIPS: BCM63xx: Fix SPI message control register handling for BCM6338/6348.	2012-08-17 10:57:28 +02:00
boot
cavium-octeon
cobalt
configs
dec	MIPS: DEC: use IS_ENABLED()	2012-07-23 13:55:54 +01:00
emma	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
fw	MIPS: Remove all -Wall and almost all -Werror usage from arch/mips.	2012-05-21 15:09:36 +01:00
include/asm	MIPS: ath79: don't hardcode the unavailability of the DSP ASE	2012-08-17 10:57:29 +02:00
jazz	Merge branch 'next/generic' into mips-for-linux-next	2012-01-11 15:41:47 +01:00
jz4740
kernel	MIPS: Synchronize MIPS count one CPU at a time	2012-08-17 10:57:28 +02:00
lantiq
lasat
lib
loongson
loongson1
math-emu	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
mipssim	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
mm	MIPS: Fixup ordering of micro assembler instructions.	2012-07-23 13:55:56 +01:00
mti-malta	MIPS: Malta: Delete duplicate PCI fixup.	2012-08-17 10:57:29 +02:00
netlogic	Merge branches 'next/generic', 'next/alchemy', 'next/bcm63xx', 'next/cavium', 'next/jz4740', 'next/lantiq', 'next/loongson1b' and 'next/netlogic' into mips-for-linux-next	2012-07-25 16:37:46 +02:00
oprofile
pci	Merge commit 'v3.6-rc5' into pci/gavin-window-alignment	2012-09-13 15:54:57 -06:00
pmc-sierra
pnx833x	MIPS: PNX833x: use IS_ENABLED() macro	2012-07-23 13:55:53 +01:00
pnx8550
power
powertv
rb532	- More robust parsing especially of xattr data in JFFS2	2012-06-01 16:55:42 -07:00
sgi-ip22
sgi-ip27
sgi-ip32
sibyte
sni	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-05-29 18:27:19 -07:00
txx9	MIPS: txx9: Fix redefinition of clk_* by adding select HAVE_CLK	2012-08-01 17:59:15 +02:00
vr41xx
wrppmc
Kbuild	MIPS: Repair Kbuild make clean breakage.	2010-10-19 18:32:39 +01:00
Kbuild.platforms
Kconfig	MIPS: ath79: select HAVE_CLK	2012-08-17 10:57:27 +02:00
Kconfig.debug	Fix typo in various Kconfig file	2012-04-16 14:40:08 +02:00
Makefile	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2012-05-28 10:32:28 -07:00