linux/drivers/net/wireless/b43
Linus Torvalds 5f05647dd8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits)
  bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.
  vlan: Calling vlan_hwaccel_do_receive() is always valid.
  tproxy: use the interface primary IP address as a default value for --on-ip
  tproxy: added IPv6 support to the socket match
  cxgb3: function namespace cleanup
  tproxy: added IPv6 support to the TPROXY target
  tproxy: added IPv6 socket lookup function to nf_tproxy_core
  be2net: Changes to use only priority codes allowed by f/w
  tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled
  tproxy: added tproxy sockopt interface in the IPV6 layer
  tproxy: added udp6_lib_lookup function
  tproxy: added const specifiers to udp lookup functions
  tproxy: split off ipv6 defragmentation to a separate module
  l2tp: small cleanup
  nf_nat: restrict ICMP translation for embedded header
  can: mcp251x: fix generation of error frames
  can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set
  can-raw: add msg_flags to distinguish local traffic
  9p: client code cleanup
  rds: make local functions/variables static
  ...

Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and
drivers/net/wireless/ath/ath9k/debug.c as per David
2010-10-23 11:47:02 -07:00
..
b43.h b43: define B43_SHM_SH_CHAN_40MHZ 2010-10-06 16:30:41 -04:00
debugfs.c
debugfs.h
dma.c
dma.h
Kconfig
leds.c
leds.h
lo.c
lo.h
main.c
main.h
Makefile b43: N-PHY: put 2056-radio's specific code in separated file 2010-10-15 15:57:40 -04:00
pcmcia.c pcmcia: move driver name to struct pcmcia_driver 2010-09-29 17:20:24 +02:00
pcmcia.h
phy_a.c
phy_a.h
phy_common.c b43: define B43_SHM_SH_CHAN_40MHZ 2010-10-06 16:30:41 -04:00
phy_common.h b43: N-PHY: replace N-specific radio_chanspec with common code 2010-10-15 15:57:36 -04:00
phy_g.c
phy_g.h
phy_lp.c
phy_lp.h
phy_n.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2010-10-15 16:11:56 -04:00
phy_n.h b43: N-PHY: put radio-specific code in separated file 2010-10-15 15:57:38 -04:00
pio.c
pio.h
radio_2055.c b43: N-PHY: put radio-specific code in separated file 2010-10-15 15:57:38 -04:00
radio_2055.h b43: N-PHY: put radio-specific code in separated file 2010-10-15 15:57:38 -04:00
radio_2056.c b43: N-PHY: put 2056-radio's specific code in separated file 2010-10-15 15:57:40 -04:00
radio_2056.h b43: N-PHY: put 2056-radio's specific code in separated file 2010-10-15 15:57:40 -04:00
rfkill.c
rfkill.h
sdio.c
sdio.h
sysfs.c
sysfs.h
tables.c
tables.h
tables_lpphy.c
tables_lpphy.h
tables_nphy.c b43: N-PHY: put 2056-radio's specific code in separated file 2010-10-15 15:57:40 -04:00
tables_nphy.h b43: N-PHY: put 2056-radio's specific code in separated file 2010-10-15 15:57:40 -04:00
wa.c
wa.h
xmit.c
xmit.h