John W. Linville abf52f86aa Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 ... Conflicts: net/mac80211/mlme.c		2010-06-17 16:21:14 -04:00
..
eeprom.c	drivers/net/wireless/p54: Use kmemdup	2010-06-02 16:13:12 -04:00
eeprom.h
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
led.c
lmac.h
main.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2010-05-05 16:14:16 -04:00
Makefile
net2280.h
p54.h
p54pci.c	p54pci: add Symbol AP-300 minipci adapters pciid	2010-06-14 15:05:06 -04:00
p54pci.h
p54spi.c	p54spi: replace internal "cx3110x" name with "p54spi"	2010-06-04 16:00:38 -04:00
p54spi.h
p54spi_eeprom.h
p54usb.c	p54usb: Comment out duplicate Medion MD40900 device id	2010-06-16 14:58:57 -04:00
p54usb.h
txrx.c	p54: remove usage of deprecated noise value	2010-04-28 16:48:22 -04:00