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
..
b43_pci_bridge.c
driver_chipcommon.c	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-12-14 14:27:45 -08:00
driver_chipcommon_pmu.c	MIPS: BCM47XX: add bcm47xx prefix in front of nvram function names	2013-02-15 19:01:57 +01:00
driver_chipcommon_sflash.c	ssb: add database of serial flash memories	2013-01-11 14:49:58 -05:00
driver_extif.c	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-12-14 14:27:45 -08:00
driver_gige.c	Drivers: ssb: remove __dev* attributes.	2013-01-03 15:57:15 -08:00
driver_gpio.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-08 18:02:14 -05:00
driver_mipscore.c	ssb: register platform device for parallel flash	2013-01-30 15:06:46 -05:00
driver_pcicore.c	Drivers: ssb: remove __dev* attributes.	2013-01-03 15:57:15 -08:00
embedded.c	ssb: register watchdog driver	2012-12-06 14:58:58 -05:00
Kconfig	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-01-28 13:54:03 -05:00
main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-08 18:02:14 -05:00
Makefile	ssb: add place for serial flash driver	2013-01-09 14:37:09 -05:00
pci.c
pcihost_wrapper.c	Drivers: ssb: remove __dev* attributes.	2013-01-03 15:57:15 -08:00
pcmcia.c
scan.c
sdio.c
sprom.c
ssb_private.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-08 18:02:14 -05:00