David S. Miller 28b4d5cc17 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/net/pcmcia/fmvj18x_cs.c
	drivers/net/pcmcia/nmclan_cs.c
	drivers/net/pcmcia/xirc2ps_cs.c
	drivers/net/wireless/ray_cs.c

2009-12-05 15:22:26 -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: Fix SPROM writing

2009-11-23 17:05:41 -05: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

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

ssb: Fix range check in sprom write

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

ssb_private.h

ssb: Fix SPROM writing

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