John W. Linville e00cf3b9eb Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-tx.c
	net/mac80211/sta_info.h

2011-05-16 19:32:19 -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

ssb: cc: use correct min_msk for 0x4312

2011-04-25 14:50:13 -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

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

…

driver_pcicore.c

ssb: move ssb_commit_settings and export it

2011-05-11 14:50:41 -04:00

embedded.c

…

Kconfig

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

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

main.c

ssb: fix pcicore build breakage

2011-05-13 15:05:46 -04:00

Makefile

…

pci.c

Fix common misspellings

2011-03-31 11:26:23 -03: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: update list of devices supporting multiple 80211 cores

2011-05-11 10:17:17 -04:00

sdio.c

…

sprom.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

ssb_private.h

ssb: fix typo in ifdef comment

2010-02-15 16:12:53 -05:00