John W. Linville 515db09338 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux ... Conflicts: drivers/net/wireless/iwlegacy/iwl-debugfs.c drivers/net/wireless/iwlegacy/iwl-rx.c drivers/net/wireless/iwlegacy/iwl-scan.c drivers/net/wireless/iwlegacy/iwl-tx.c include/net/bluetooth/bluetooth.h		2011-11-22 14:05:46 -05:00
..
Makefile	brcm80211: fmac: move chip recognition function to sdio_chip.c	2011-11-09 16:13:56 -05:00
bcmchip.h	brcm80211: fmac: move chip recognition function to sdio_chip.c	2011-11-09 16:13:56 -05:00
bcmsdh.c	drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:08 -04:00
bcmsdh_sdmmc.c	net: wireless: brcm80210: include module.h	2011-10-14 14:48:20 -04:00
dhd.h	brcm80211: fmac: remove state from brcmf_if in fullmac	2011-11-08 15:54:25 -05:00
dhd_bus.h	…
dhd_cdc.c	…
dhd_common.c	brcm80211: fmac: use brcmf_add_if for all net devices	2011-11-08 15:54:24 -05:00
dhd_dbg.h	…
dhd_linux.c	brcm80211: fmac: remove state from brcmf_if in fullmac	2011-11-08 15:54:25 -05:00
dhd_proto.h	…
dhd_sdio.c	brcm80211: fmac: remove PCMCIA core related code	2011-11-11 14:28:45 -05:00
sdio_chip.c	brcm80211: fmac: remove id retrieve code	2011-11-11 14:28:38 -05:00
sdio_chip.h	brcm80211: fmac: add resetcore function for bcm4330 chip	2011-11-11 14:28:37 -05:00
sdio_host.h	…
wl_cfg80211.c	brcm80211: fmac: release bss struct returned from cfg80211_inform_bss	2011-11-11 14:28:47 -05:00
wl_cfg80211.h	brmc80211: fmac: reworked next_bss()	2011-11-08 15:54:04 -05:00