Linus Torvalds
6cfa92382e
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
...
Pull MIPS fixes from Ralf Baechle:
"Fixes for a number of small glitches in various corners of the MIPS
tree. No particular areas is standing out.
With this applied all MIPS defconfigs are building fine. No merge
conflicts are expected."
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: Delete definition of SA_RESTORER.
MIPS: Fix ISA level which causes secondary cache init bypassing and more
MIPS: Fix build error cavium-octeon without CONFIG_SMP
MIPS: Kconfig: Rename SNIPROM too
MIPS: Alchemy: Fix typo "CONFIG_DEBUG_PCI"
MIPS: Unbreak function tracer for 64-bit kernel.
2013-04-05 12:23:12 -07:00
..
alchemy
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
ar7
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
ath79
Merge git://www.linux-watchdog.org/linux-watchdog
2013-03-03 10:23:29 -08:00
bcm47xx
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next
2013-02-22 10:07:30 +01:00
bcm63xx
Revert "MIPS: BCM63XX: Call board_register_device from device_initcall()"
2013-03-19 19:15:47 +01:00
boot
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
cavium-octeon
MIPS: Fix build error cavium-octeon without CONFIG_SMP
2013-04-05 15:10:39 +02:00
cobalt
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
configs
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
dec
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
emma
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
fw
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
include
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-04-05 12:23:12 -07:00
jazz
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-03-02 07:44:16 -08:00
jz4740
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
kernel
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-04-05 12:23:12 -07:00
lantiq
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-03-02 07:44:16 -08:00
lasat
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-03-02 07:44:16 -08:00
lib
MIPS: Fix logic errors in bitops.c
2013-03-12 18:57:47 +01:00
loongson
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
loongson1
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
math-emu
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
mm
MIPS: Fix ISA level which causes secondary cache init bypassing and more
2013-04-05 15:10:45 +02:00
mti-malta
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
mti-sead3
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
netlogic
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
oprofile
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
pci
MIPS: Alchemy: Fix typo "CONFIG_DEBUG_PCI"
2013-04-05 15:10:27 +02:00
pmcs-msp71xx
MIPS: MSP71xx: Move code.
2013-02-01 10:00:22 +01:00
pnx833x
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
power
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
powertv
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
ralink
MIPS: ralink: add CPU interrupt controller to of_irq_ids
2013-02-17 01:25:34 +01:00
rb532
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
sgi-ip22
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
sgi-ip27
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-03-02 07:44:16 -08:00
sgi-ip32
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
sibyte
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
sni
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-03-02 07:44:16 -08:00
txx9
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
vr41xx
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
wrppmc
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
Kbuild
Kbuild.platforms
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
Kconfig
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-04-05 12:23:12 -07:00
Kconfig.debug
Fix typo in various Kconfig file
2012-04-16 14:40:08 +02:00
Makefile
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00