linux/arch/mips/sni
Jiri Kosina e75d660672 Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.

Conflicts:
	drivers/net/ethernet/realtek/r8169.c
2012-04-08 21:48:52 +02:00
..
a20r.c MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
eisa.c mips: remove driver_data direct access of struct device 2009-06-15 21:30:27 -07:00
irq.c MIPS: irq: Remove IRQF_DISABLED 2011-12-07 22:03:45 +00:00
Makefile MIPS: SNI: Migrate to new platform makefile style. 2010-08-05 13:25:49 +01:00
pcimt.c mips: Fix printk typos in arc/mips 2012-04-05 17:04:27 -07:00
pcit.c MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
Platform MIPS: SNI: Migrate to new platform makefile style. 2010-08-05 13:25:49 +01:00
reset.c Disintegrate asm/system.h for MIPS 2012-03-28 18:30:02 +01:00
rm200.c MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD 2011-09-21 17:52:15 +02:00
setup.c MIPS: Move several variables from .bss to .init.data 2009-12-17 01:57:27 +00:00
time.c MIPS: irq: Remove IRQF_DISABLED 2011-12-07 22:03:45 +00:00