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. |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
b43_pci_bridge.c | ||
driver_chipcommon.c | ||
driver_chipcommon_pmu.c | ||
driver_chipcommon_sflash.c | ||
driver_extif.c | ||
driver_gige.c | ||
driver_gpio.c | ||
driver_mipscore.c | ||
driver_pcicore.c | ||
embedded.c | ||
main.c | ||
pci.c | ||
pcihost_wrapper.c | ||
pcmcia.c | ||
scan.c | ||
sdio.c | ||
sprom.c | ||
ssb_private.h |