iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/arch/mips
History
David S. Miller efd0bf97de Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c
2011-11-21 13:50:33 -05:00
..
alchemy
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2011-11-03 13:28:14 -07:00
ar7
MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD
2011-09-21 17:52:15 +02:00
ath79
USB: ohci: add bus glue for the Atheros AR71XX/AR7240 SoCs
2011-04-13 16:58:19 -07:00
bcm47xx
mips: add export.h to files using EXPORT_SYMBOL/THIS_MODULE
2011-10-31 19:30:57 -04:00
bcm63xx
MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD
2011-09-21 17:52:15 +02:00
boot
MIPS: Alchemy: Rewrite UART setup and constants.
2011-05-19 09:55:45 +01:00
cavium-octeon
MIPS: Octeon: Fix compile error in arch/mips/cavium-octeon/flash_setup.c
2011-11-10 17:59:45 +00:00
cobalt
MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD
2011-09-21 17:52:15 +02:00
configs
rtc: fix build warnings in defconfigs
2011-06-15 20:04:02 -07:00
dec
MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD
2011-09-21 17:52:15 +02:00
emma
MIPS: Yosemite, Emma: Fix off-by-two in arcs_cmdline buffer size check
2011-11-08 12:35:29 +00:00
fw
Merge branch 'master' into for-next
2011-04-26 10:22:59 +02:00
include/asm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-11-21 13:50:33 -05:00
jazz
i8253: Create linux/i8253.h and use it in all 8253 related files
2011-06-09 15:01:37 +02:00
jz4740
MIPS: JZ4740: GPIO: Check correct IRQ in demux handler
2011-10-24 23:34:25 +01:00
kernel
MIPS: ASID conflict after CPU hotplug
2011-11-10 17:59:45 +00:00
lantiq
MIPS: lantiq: use export.h in favour of module.h
2011-11-14 13:59:24 +00:00
lasat
MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD
2011-09-21 17:52:15 +02:00
lib
MIPS: Kconfig and Makefile update for Netlogic XLR/XLS
2011-05-19 09:55:40 +01:00
loongson
mips: fix implicit smp.h usage in various files.
2011-10-31 19:30:55 -04:00
math-emu
perf: Remove the nmi parameter from the swevent and overflow interface
2011-07-01 11:06:35 +02:00
mipssim
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
mm
MIPS: Remove __init from add_wired_entry()
2011-10-24 23:34:23 +01:00
mti-malta
MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD
2011-09-21 17:52:15 +02:00
netlogic
MIPS: XLR, XLS: Add comment for smp setup
2011-10-24 23:34:25 +01:00
oprofile
MIPS: oprofile: Add callgraph support
2011-06-15 14:35:34 +02:00
pci
MIPS: lantiq: use export.h in favour of module.h
2011-11-14 13:59:24 +00:00
pmc-sierra
MIPS: Yosemite, Emma: Fix off-by-two in arcs_cmdline buffer size check
2011-11-08 12:35:29 +00:00
pnx833x
Fix common misspellings
2011-03-31 11:26:23 -03:00
pnx8550
MIPS: PNX8550: Fix section mismatch
2011-10-20 15:00:18 +01:00
power
MIPS: Hibernation: Fixes for PAGE_SIZE >= 64kb
2011-05-10 18:15:26 +01:00
powertv
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
rb532
mips: add export.h to files using EXPORT_SYMBOL/THIS_MODULE
2011-10-31 19:30:57 -04:00
sgi-ip22
MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD
2011-09-21 17:52:15 +02:00
sgi-ip27
MIPS: IP27: Sort out section mismatch.
2011-10-20 15:00:18 +01:00
sgi-ip32
MIPS: Convert the irq functions to the new names
2011-03-29 14:48:07 +02:00
sibyte
MIPS: SB1250: Restore dropped irq_mask function
2011-07-20 23:12:11 +01:00
sni
MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD
2011-09-21 17:52:15 +02:00
txx9
mips: add export.h to files using EXPORT_SYMBOL/THIS_MODULE
2011-10-31 19:30:57 -04:00
vr41xx
mips: fix implicit smp.h usage in various files.
2011-10-31 19:30:55 -04:00
wrppmc
MIPS: WRPPMC: Migrate to new platform makefile style.
2010-08-05 13:25:51 +01:00
Kbuild
MIPS: Repair Kbuild make clean breakage.
2010-10-19 18:32:39 +01:00
Kbuild.platforms
MIPS: XLR, XLS: Move makefile bits to were they belong.
2011-07-20 23:12:11 +01:00
Kconfig
Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2011-11-06 18:54:53 -08:00
Kconfig.debug
lib: consolidate DEBUG_STACK_USAGE option
2011-05-25 08:39:54 -07:00
Makefile
kbuild: Fix missing system calls check on mips.
2011-11-09 14:37:44 +01:00