linux-stable/drivers/net/wireless/b43
Linus Torvalds 3f5785ec31 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (89 commits)
  bonding: documentation and code cleanup for resend_igmp
  bonding: prevent deadlock on slave store with alb mode (v3)
  net: hold rtnl again in dump callbacks
  Add Fujitsu 1000base-SX PCI ID to tg3
  bnx2x: protect sequence increment with mutex
  sch_sfq: fix peek() implementation
  isdn: netjet - blacklist Digium TDM400P
  via-velocity: don't annotate MAC registers as packed
  xen: netfront: hold RTNL when updating features.
  sctp: fix memory leak of the ASCONF queue when free asoc
  net: make dev_disable_lro use physical device if passed a vlan dev (v2)
  net: move is_vlan_dev into public header file (v2)
  bug.h: Fix build with CONFIG_PRINTK disabled.
  wireless: fix fatal kernel-doc error + warning in mac80211.h
  wireless: fix cfg80211.h new kernel-doc warnings
  iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled
  dst: catch uninitialized metrics
  be2net: hash key for rss-config cmd not set
  bridge: initialize fake_rtable metrics
  net: fix __dst_destroy_metrics_generic()
  ...

Fix up trivial conflicts in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
2011-05-25 17:00:17 -07:00
..
b43.h Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 2011-05-25 13:28:55 -04:00
debugfs.c
debugfs.h
dma.c b43: dma: cache translation (routing bits) 2011-05-19 13:54:07 -04:00
dma.h b43: allocate receive buffers big enough for max frame len + offset 2011-04-04 15:22:11 -04:00
Kconfig b43: trivial: update B43_PHY_N description (PHY support) 2011-03-07 13:51:04 -05:00
leds.c b43: rename b43_wldev's field with ssb_device to sdev 2011-05-16 14:25:28 -04:00
leds.h
lo.c b43: rename b43_wldev's field with ssb_device to sdev 2011-05-16 14:25:28 -04:00
lo.h
main.c Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2011-05-24 16:47:54 -04:00
main.h b43: move MAC PHY clock controling function 2011-05-11 14:50:39 -04:00
Makefile
pcmcia.c pcmcia: Convert pcmcia_device_id declarations to const 2011-05-06 07:46:22 +02:00
pcmcia.h
phy_a.c b43: rename b43_wldev's field with ssb_device to sdev 2011-05-16 14:25:28 -04:00
phy_a.h
phy_common.c b43: rename b43_wldev's field with ssb_device to sdev 2011-05-16 14:25:28 -04:00
phy_common.h
phy_g.c b43: rename b43_wldev's field with ssb_device to sdev 2011-05-16 14:25:28 -04:00
phy_g.h Fix common misspellings 2011-03-31 11:26:23 -03:00
phy_lp.c b43: rename b43_wldev's field with ssb_device to sdev 2011-05-16 14:25:28 -04:00
phy_lp.h
phy_n.c b43: rename b43_wldev's field with ssb_device to sdev 2011-05-16 14:25:28 -04:00
phy_n.h Fix common misspellings 2011-03-31 11:26:23 -03:00
pio.c b43: add helpers for block R/W ops 2011-05-19 13:54:06 -04:00
pio.h
radio_2055.c
radio_2055.h
radio_2056.c
radio_2056.h
rfkill.c b43: rename b43_wldev's field with ssb_device to sdev 2011-05-16 14:25:28 -04:00
rfkill.h
sdio.c b43: rename b43_wldev's field with ssb_device to sdev 2011-05-16 14:25:28 -04:00
sdio.h
sysfs.c b43: rename b43_wldev's field with ssb_device to sdev 2011-05-16 14:25:28 -04:00
sysfs.h
tables.c
tables.h
tables_lpphy.c b43: rename b43_wldev's field with ssb_device to sdev 2011-05-16 14:25:28 -04:00
tables_lpphy.h
tables_nphy.c b43: N-PHY: rev3+: add tables with gain ctl workarounds 2011-03-04 14:05:18 -05:00
tables_nphy.h b43: N-PHY: rev3+: add tables with gain ctl workarounds 2011-03-04 14:05:18 -05:00
wa.c b43: rename b43_wldev's field with ssb_device to sdev 2011-05-16 14:25:28 -04:00
wa.h
xmit.c b43: rename b43_wldev's field with ssb_device to sdev 2011-05-16 14:25:28 -04:00
xmit.h b43: fill PHY ctl word1 in TX header for N-PHY 2011-02-25 15:33:39 -05:00