android_kernel_motorola_sm6225/drivers/net/wireless/b43
David S. Miller caea902f72 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/wireless/rt2x00/Kconfig
	drivers/net/wireless/rt2x00/rt2x00usb.c
	net/sctp/protocol.c
2008-06-16 18:25:48 -07:00
..
b43.h Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-06-16 18:25:48 -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 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-06-16 18:25:48 -07: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 [B43]: LED triggers support 2007-10-10 16:54:11 -07:00
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-16 18:25:48 -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 [B43]: add mac80211-based driver for modern BCM43xx devices 2007-10-10 16:51:37 -07:00
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 b43: fix use-after-free rfkill bug 2008-01-16 12:53:32 -05:00
rfkill.h b43: Rewrite and fix rfkill init 2007-11-10 04:25:12 -05:00
sysfs.c cfg80211 API for channels/bitrates, mac80211 and driver conversion 2008-02-29 15:19:32 -05:00
sysfs.h [B43]: add mac80211-based driver for modern BCM43xx devices 2007-10-10 16:51:37 -07:00
tables.c b43: Fix for broken transmission 2008-01-28 15:05:59 -08:00
tables.h b43: rewrite A PHY initialization 2008-01-28 15:04:31 -08:00
tables_nphy.c b43: Add lots of N-PHY lookup tables 2008-01-28 15:10:03 -08:00
tables_nphy.h b43: Add lots of N-PHY lookup tables 2008-01-28 15:10:03 -08:00
wa.c b43: pull out helpers for writing noise table 2008-03-13 16:02:33 -04:00
wa.h b43: rewrite A PHY initialization 2008-01-28 15:04:31 -08:00
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