David S. Miller a2bfbc072e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/can/Kconfig		2009-11-17 00:05:02 -08:00
..
eeprom.c	p54: disable channels with incomplete calibration data sets	2009-11-02 15:43:23 -05:00
eeprom.h
fwio.c	p54: implement rfkill	2009-08-14 09:13:45 -04: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
main.c	mac80211: allow configure_filter callback to sleep	2009-08-20 11:35:58 -04:00
Makefile
net2280.h
p54.h
p54pci.c
p54pci.h
p54spi.c	spi: prefix modalias with "spi:"	2009-09-23 07:39:43 -07:00
p54spi.h
p54spi_eeprom.h
p54usb.c	p54usb: Remove DMA buffer from stack	2009-11-13 17:33:49 -05:00
p54usb.h
txrx.c	p54: fix broadcast buffering in AP mode	2009-08-28 14:40:23 -04:00