David S. Miller 2071a0084a Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-1000.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-core.h

2009-11-11 11:38:16 -08:00

..

b43_pci_bridge.c

b43: Add BCM4307 PCI-ID

2009-03-27 20:13:20 -04:00

driver_chipcommon_pmu.c

ssb: Implement PMU LDO control and use it in b43

2009-08-28 14:40:53 -04:00

driver_chipcommon.c

ssb: Add PMU support

2009-02-09 15:03:49 -05:00

driver_extif.c

ssb: Make the GPIO API reentrancy safe

2008-02-20 20:11:49 -05:00

driver_gige.c

ssb: Add Gigabit Ethernet driver

2008-03-06 17:09:43 -05:00

driver_mipscore.c

MIPS: BC47xx: Fix SSB irq setup

2009-07-03 15:45:27 +01:00

driver_pcicore.c

ssb: Put host pointers into a union

2009-10-27 16:47:55 -04:00

embedded.c

SSB: BCM47xx: Export ssb_watchdog_timer_set

2009-06-08 16:57:50 +01:00

Kconfig

ssb: Implement SDIO host bus support

2009-09-09 11:19:00 -04:00

main.c

ssb: Implement SDIO host bus support

2009-09-09 11:19:00 -04:00

Makefile

ssb: Implement SDIO host bus support

2009-09-09 11:19:00 -04:00

pci.c

ssb: Fix error when V1 SPROM extraction is forced

2009-09-14 14:36:05 -04:00

pcihost_wrapper.c

ssb: struct device - replace bus_id with dev_name(), dev_set_name()

2008-11-21 11:06:03 -05:00

pcmcia.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2009-07-09 20:33:18 -07:00

scan.c

ssb-pcmcia: Fix 32bit register access in early bus scanning

2009-11-10 16:21:12 -05:00

sdio.c

ssb/sdio: fix printk format warnings

2009-09-16 16:21:00 -04:00

sprom.c

ssb: Add SPROM fallback support

2009-03-05 14:39:32 -05:00

ssb_private.h

ssb: Implement SDIO host bus support

2009-09-09 11:19:00 -04:00