John W. Linville 3b51cc996e Merge branch 'master' into for-davem ...

Conflicts:
	drivers/net/wireless/ath/ath9k/phy.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-debugfs.c

2010-04-23 14:43:45 -04:00

..

eeprom.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

eeprom.h

p54: Move eeprom header

2009-07-10 15:01:58 -04:00

fwio.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

Kconfig

wireless: remove WLAN_80211 and WLAN_PRE80211 from Kconfig

2009-10-30 16:50:35 -04:00

led.c

mac80211: redefine usage of the mac80211 workqueue

2009-08-04 16:44:14 -04:00

lmac.h

p54: fix beaconing related firmware crash

2009-07-24 15:05:21 -04:00

main.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-04-11 14:53:53 -07:00

Makefile

p54: Modify p54 files for new organization

2009-07-10 15:02:24 -04:00

net2280.h

…

p54.h

p54: remove get_tx_stats() mac80211 op

2010-02-08 16:51:01 -05:00

p54pci.c

Merge branch 'master' into for-davem

2010-04-23 14:43:45 -04:00

p54pci.h

p54pci: move tx cleanup into tasklet

2010-01-19 16:43:12 -05:00

p54spi_eeprom.h

…

p54spi.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

p54spi.h

…

p54usb.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2010-04-06 08:34:06 -07:00

p54usb.h

p54usb: rework driver for resume

2009-05-06 15:14:41 -04:00

txrx.c

wireless/prism54: remove trailing space in messages

2010-03-31 14:39:07 -04:00