David S. Miller 65b53e4cc9 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h

2008-06-10 02:22:26 -07:00

..

Kconfig

…

Makefile

…

net2280.h

…

p54.h

mac80211: clean up get_tx_stats callback

2008-05-07 15:02:26 -04:00

p54common.c

p54: fix skb->cb tx info conversion

2008-06-03 15:00:28 -04:00

p54common.h

mac80211: move TX info into skb->cb

2008-05-21 21:48:11 -04:00

p54pci.c

mac80211: let drivers wake but not start queues

2008-05-21 21:48:08 -04:00

p54pci.h

…

p54usb.c

USB ID for Philips CPWUA054/00 Wireless USB Adapter 11g

2008-06-04 15:57:11 -04:00

p54usb.h

…