John W. Linville b67afe7f43 Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 ... Conflicts: drivers/bluetooth/ath3k.c drivers/bluetooth/btusb.c		2011-02-18 17:03:41 -05:00
..
Kconfig	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
b43_pci_bridge.c	ssb: b43-pci-bridge: Add new vendor for BCM4318	2010-11-22 15:19:31 -05:00
driver_chipcommon.c	ssb: Handle alternate SSPROM location	2010-06-04 15:04:50 -04:00
driver_chipcommon_pmu.c	ssb: update PMU init to match specs	2010-06-03 14:10:43 -04:00
driver_extif.c	ssb: Make the GPIO API reentrancy safe	2008-02-20 20:11:49 -05:00
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
main.c	ssb: reset device only if it was enabled	2011-02-18 16:54:55 -05:00
pci.c	ssb: trivial: fix SPROM extract warning formatting	2011-02-18 16:54:52 -05:00
pcihost_wrapper.c	ssb: Clear RETRY_TIMEOUT in PCI Configuration for normal devices	2010-11-15 13:23:28 -05:00
pcmcia.c	ssb-pcmcia: Fix parsing of invariants tuples	2011-02-07 16:02:14 -05:00
scan.c	ssb: Ignore dangling ethernet cores on wireless devices	2011-01-10 15:40:53 -05:00
sdio.c	ssb/sdio: fix printk format warnings	2009-09-16 16:21:00 -04:00
sprom.c	ssb: fix NULL ptr deref when pcihost_wrapper is used	2010-05-28 13:57:01 -04:00
ssb_private.h	ssb: fix typo in ifdef comment	2010-02-15 16:12:53 -05:00