Ralf Baechle edb15d83a8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next ... Conflicts: include/linux/ssb/ssb_driver_gige.h Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/- bgmac.c due to change of an API.		2013-02-22 10:07:30 +01:00
..
Kconfig	MIPS: BCM47xx: Enable SSB prerequisite SSB_DRIVER_PCICORE.	2013-01-16 16:29:36 +01:00
Makefile	MIPS: Whitespace cleanup.	2013-02-01 10:00:22 +01:00
Platform	MIPS: BCM47xx: Migrate to new platform makefile style.	2010-08-05 13:25:54 +01:00
irq.c	bcm47xx: fix irq assignment for new SoCs.	2011-08-08 14:29:33 -04:00
nvram.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
prom.c	MIPS: BCM47XX: improve memory size detection	2012-11-09 11:37:17 +01:00
serial.c	bcma: return the mips irq number in bcma_core_irq	2013-01-11 14:49:59 -05:00
setup.c	MIPS: BCM47XX: add bcm47xx prefix in front of nvram function names	2013-02-15 19:01:57 +01:00
sprom.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
time.c	bcm47xx: add support for bcma bus	2011-08-08 14:29:32 -04:00
wgt634u.c	MIPS: Whitespace cleanup.	2013-02-01 10:00:22 +01:00