Linus Torvalds 1a9b4993b7 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus ... Pull MIPS updates from Ralf Baechle: "The lion share of this pull request are fixes for clk-related breakage caused by other changes during this merge window. For some platforms the fix was as simple as selecting HAVE_CLK, for others like the Loongson 2 significant restructuring was required. The remainder are changes required to get the Lantiq code to work again." * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MIPS: Loongson 2: Sort out clock managment. MIPS: Loongson 1: more clk support and add select HAVE_CLK MIPS: txx9: Fix redefinition of clk_* by adding select HAVE_CLK MIPS: BCM63xx: Fix redefinition of clk_* by adding select HAVE_CLK MIPS: AR7: Fix redefinition of clk_* by adding select HAVE_CLK MIPS: Lantiq: Platform specific CLK fixup MIPS: Lantiq: Add device_tree_init function MIPS: Lantiq: Fix interface clock and PCI control register offset		2012-08-01 16:47:15 -07:00
..
alchemy	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
ar7	arch: Use eth_random_addr	2012-07-16 22:39:25 -07:00
ath79
bcm47xx	MIPS: BCM47xx: Fix BCMA_DRIVER_PCI_HOSTMODE config dependencies	2012-07-19 11:23:43 +02:00
bcm63xx	MIPS: BCM63XX: Add 96328avng reference board	2012-07-24 16:33:14 +02:00
boot	MIPS: Enable vmlinuz for JZ4740	2012-07-23 13:56:21 +01:00
cavium-octeon	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
cobalt
configs	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
dec	MIPS: DEC: use IS_ENABLED()	2012-07-23 13:55:54 +01:00
emma
fw
include/asm	MIPS: Loongson 2: Sort out clock managment.	2012-08-01 18:10:06 +02:00
jazz
jz4740	MIPS: JZ4740: reset: Initialize hibernate wakeup counters.	2012-07-23 13:56:20 +01:00
kernel	MIPS: Loongson 2: Sort out clock managment.	2012-08-01 18:10:06 +02:00
lantiq	MIPS: Lantiq: Platform specific CLK fixup	2012-08-01 17:58:09 +02:00
lasat
lib	MIPS: Unify memcpy.S and memcpy-inatomic.S	2012-07-23 13:55:55 +01:00
loongson	MIPS: Loongson 2: Sort out clock managment.	2012-08-01 18:10:06 +02:00
loongson1	MIPS: Loongson 1: more clk support and add select HAVE_CLK	2012-08-01 17:59:23 +02:00
math-emu
mipssim
mm	MIPS: Fixup ordering of micro assembler instructions.	2012-07-23 13:55:56 +01:00
mti-malta	MIPS: PCI: Move fixups from __init to __devinit.	2012-07-19 11:27:23 +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	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
pci	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-07-30 11:45:52 -07:00
pmc-sierra	PCI changes for the 3.6 merge window:	2012-07-24 16:17:07 -07:00
pnx833x	MIPS: PNX833x: use IS_ENABLED() macro	2012-07-23 13:55:53 +01:00
pnx8550
power
powertv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-07-24 10:01:50 -07:00
rb532	- More robust parsing especially of xattr data in JFFS2	2012-06-01 16:55:42 -07:00
sgi-ip22
sgi-ip27	mips: zero out pg_data_t when it's allocated	2012-07-31 18:42:49 -07:00
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
Kbuild.platforms	MIPS: Loongson 1B: Add board support	2012-07-25 16:17:24 +02:00
Kconfig	MIPS: BCM63xx: Fix redefinition of clk_* by adding select HAVE_CLK	2012-08-01 17:59:06 +02:00
Kconfig.debug
Makefile	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2012-05-28 10:32:28 -07:00