Linus Torvalds 857b50f5d0 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus ... Pull MIPS updates from Ralf Baechle: "This is the MIPS pull request for the next kernel: - Zubair's patch series adds CMA support for MIPS. Doing so it also touches ARM64 and x86. - remove the last instance of IRQF_DISABLED from arch/mips - updates to two of the MIPS defconfig files. - cleanup of how cache coherency bits are handled on MIPS and implement support for write-combining. - platform upgrades for Alchemy - move MIPS DTS files to arch/mips/boot/dts/" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (24 commits) MIPS: ralink: remove deprecated IRQF_DISABLED MIPS: pgtable.h: Implement the pgprot_writecombine function for MIPS MIPS: cpu-probe: Set the write-combine CCA value on per core basis MIPS: pgtable-bits: Define the CCA bit for WC writes on Ingenic cores MIPS: pgtable-bits: Move the CCA bits out of the core's ifdef blocks MIPS: DMA: Add cma support x86: use generic dma-contiguous.h arm64: use generic dma-contiguous.h asm-generic: Add dma-contiguous.h MIPS: BPF: Add new emit_long_instr macro MIPS: ralink: Move device-trees to arch/mips/boot/dts/ MIPS: Netlogic: Move device-trees to arch/mips/boot/dts/ MIPS: sead3: Move device-trees to arch/mips/boot/dts/ MIPS: Lantiq: Move device-trees to arch/mips/boot/dts/ MIPS: Octeon: Move device-trees to arch/mips/boot/dts/ MIPS: Add support for building device-tree binaries MIPS: Create common infrastructure for building built-in device-trees MIPS: SEAD3: Enable DEVTMPFS MIPS: SEAD3: Regenerate defconfigs MIPS: Alchemy: DB1300: Add touch penirq support ...		2014-10-18 14:24:36 -07:00
..
falcon	treewide: fix errors in printk	2014-09-01 11:18:25 +02:00
xway	treewide: fix errors in printk	2014-09-01 11:18:25 +02:00
clk.c	Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next	2013-02-21 12:51:33 +01:00
clk.h	MIPS: lantiq: adds static clock for PP32	2013-02-17 00:15:17 +01:00
early_printk.c	MIPS: lantiq: fix early printk	2012-05-15 17:49:22 +02:00
irq.c	MIPS: MT: Remove SMTC support	2014-05-24 00:07:01 +02:00
Kconfig	MIPS: Lantiq: Move device-trees to arch/mips/boot/dts/	2014-09-22 13:35:49 +02:00
Makefile	MIPS: Lantiq: Move device-trees to arch/mips/boot/dts/	2014-09-22 13:35:49 +02:00
Platform	MIPS: lantiq: implement support for FALCON soc	2012-05-21 14:31:55 +01:00
prom.c	mips: convert fdt pointers to opaque pointers	2014-04-30 00:59:13 -05:00
prom.h	of/fdt: consolidate built-in dtb section variables	2014-04-30 00:59:13 -05:00