kernel-ark/drivers/net/wireless/b43
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
..
b43.h Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-06-10 02:22:26 -07:00
debugfs.c b43: Rewrite LO calibration algorithm 2008-05-07 15:02:12 -04:00
debugfs.h b43: Rewrite LO calibration algorithm 2008-05-07 15:02:12 -04:00
dma.c mac80211: use multi-queue master netdevice 2008-05-21 21:48:14 -04:00
dma.h mac80211: move TX info into skb->cb 2008-05-21 21:48:11 -04:00
Kconfig missing dependencies on HAS_DMA 2008-05-21 16:55:59 -07:00
leds.c PM: Remove destroy_suspended_device() 2008-04-19 19:10:28 -07:00
leds.h
lo.c b43: replace limit_value macro with clamp_val 2008-05-14 16:29:32 -04:00
lo.h b43: Rewrite LO calibration algorithm 2008-05-07 15:02:12 -04:00
main.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-06-10 02:22:26 -07:00
main.h b43: Rewrite LO calibration algorithm 2008-05-07 15:02:12 -04:00
Makefile b43: Add PIO support for PCMCIA devices 2008-04-08 15:05:56 -04:00
nphy.c b43: nphy.c remove duplicated include 2008-05-14 16:29:49 -04:00
nphy.h b43: Don't compile N-PHY code when N-PHY is disabled 2008-03-25 16:41:59 -04:00
pcmcia.c ssb: Turn suspend/resume upside down 2008-04-08 15:05:57 -04:00
pcmcia.h
phy.c b43: use the bitrev helpers rather than rolling a private one 2008-05-14 16:29:50 -04:00
phy.h b43: Rewrite LO calibration algorithm 2008-05-07 15:02:12 -04:00
pio.c mac80211: use multi-queue master netdevice 2008-05-21 21:48:14 -04:00
pio.h mac80211: move TX info into skb->cb 2008-05-21 21:48:11 -04:00
rfkill.c
rfkill.h
sysfs.c
sysfs.h
tables_nphy.c
tables_nphy.h
tables.c
tables.h
wa.c
wa.h
xmit.c mac80211: move TX info into skb->cb 2008-05-21 21:48:11 -04:00
xmit.h mac80211: move TX info into skb->cb 2008-05-21 21:48:11 -04:00