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

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

2010-04-21 01:14:25 -07:00

..

b43_pci_bridge.c

b43: Add BCM4307 PCI-ID

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

driver_chipcommon_pmu.c

ssb: Add PCI ID 0x4322 to PHU handling

2010-02-19 15:52:51 -05:00

driver_chipcommon.c

ssb: Export ssb_chipco_gpio_control - needed by N PHY code

2010-03-10 17:53:51 -05:00

driver_extif.c

…

driver_gige.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

driver_mipscore.c

ssb: fix interrupt assignment

2010-02-08 16:50:54 -05:00

driver_pcicore.c

MIPS: Fix SSB PCIcore IO resource management

2010-04-12 17:26:14 +01: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

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

Makefile

ssb: Implement SDIO host bus support

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

pci.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

pcihost_wrapper.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

pcmcia.c

pcmcia: convert ssb pcmcia driver to use new CIS helpers

2009-11-08 18:23:09 +01:00

scan.c

ssb: Unconditionally log results of core scans

2009-11-23 17:05:28 -05:00

sdio.c

ssb/sdio: fix printk format warnings

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

sprom.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ssb_private.h

ssb: fix typo in ifdef comment

2010-02-15 16:12:53 -05:00