John W. Linville d859898114 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 ... Conflicts: drivers/net/wireless/ath/ath5k/sysfs.c net/bluetooth/l2cap_core.c net/mac80211/wpa.c		2011-07-11 14:46:59 -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_pmu.c	drivers/ssb/driver_chipcommon_pmu.c: uninitilized warning	2011-06-17 14:22:17 -04:00
driver_chipcommon.c	ssb: cc: prepare clockmode support for cores rev 10+	2011-05-02 14:49:14 -04:00
driver_extif.c
driver_gige.c	ssb: add __devinit to some functions	2011-06-22 16:09:58 -04:00
driver_mipscore.c	ssb: fix interrupt assignment	2010-02-08 16:50:54 -05:00
driver_pcicore.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2011-07-11 14:46:59 -04:00
embedded.c	SSB: BCM47xx: Export ssb_watchdog_timer_set	2009-06-08 16:57:50 +01:00
Kconfig	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
main.c	ssb: fix ssb clock rate according to broadcom source	2011-06-27 15:09:39 -04:00
Makefile	ssb: Implement SDIO host bus support	2009-09-09 11:19:00 -04:00
pci.c	ssb: use pci_dev->subsystem_{vendor,device}	2011-07-05 15:32:54 -04:00
pcihost_wrapper.c	ssb: add __devinit to some functions	2011-06-22 16:09:58 -04:00
pcmcia.c	ssb-pcmcia: Fix parsing of invariants tuples	2011-02-07 16:02:14 -05:00
scan.c	ssb: use pci_dev->revision	2011-06-27 15:09:40 -04:00
sdio.c	ssb/sdio: fix printk format warnings	2009-09-16 16:21:00 -04:00
sprom.c	SSB: Change fallback sprom to callback mechanism.	2011-05-19 09:55:47 +01:00
ssb_private.h	SSB: Change fallback sprom to callback mechanism.	2011-05-19 09:55:47 +01:00