John W. Linville ca994a36f5 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ...

Conflicts:
	net/mac80211/debugfs_sta.c
	net/mac80211/sta_info.h

2012-02-15 16:24:37 -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 support for bcm5354

2012-02-06 14:55:36 -05: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

ssb: add support for bcm5354

2012-02-06 14:55:36 -05:00

driver_pcicore.c

ssb: fix cardbus slot in hostmode

2012-02-01 15:26:00 -05:00

embedded.c

ssb: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE

2011-10-31 19:32:08 -04:00

Kconfig

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

main.c

ssb: add support for bcm5354

2012-02-06 14:55:36 -05:00

Makefile

…

pci.c

ssb: SPROM: extract each core power info

2012-01-24 14:06:04 -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

ssb: log the id, rev and pkg of the chip found

2012-02-06 14:53:11 -05: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

ssb: add support for bcm5354

2012-02-06 14:55:36 -05:00