John W. Linville 5d22df200b Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ... Conflicts: drivers/net/wireless/iwlwifi/iwl-agn.c		2011-12-14 14:35:41 -05:00
..
b43_pci_bridge.c	ssb: Add module.h to the real modules in drivers/ssb	2011-10-31 19:32:07 -04:00
driver_chipcommon_pmu.c	ssb: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:32:08 -04:00
driver_chipcommon.c	ssb: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:32:08 -04:00
driver_extif.c	Update my e-mail address	2011-07-07 15:18:01 +02:00
driver_gige.c	ssb: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:32:08 -04:00
driver_mipscore.c	Update my e-mail address	2011-07-07 15:18:01 +02:00
driver_pcicore.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2011-12-14 14:35:41 -05:00
embedded.c	ssb: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:32:08 -04:00
Kconfig
main.c	ssb: Add module.h to the real modules in drivers/ssb	2011-10-31 19:32:07 -04:00
Makefile
pci.c	ssb: extract FEM info from SPROM	2011-12-13 15:30:49 -05:00
pcihost_wrapper.c	ssb: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:32:08 -04:00
pcmcia.c	Update my e-mail address	2011-07-07 15:18:01 +02:00
scan.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
sdio.c	Update my e-mail address	2011-07-07 15:18:01 +02:00
sprom.c	Update my e-mail address	2011-07-07 15:18:01 +02:00
ssb_private.h