linux/drivers/net/wireless/orinoco
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
..
Kconfig
Makefile
airport.c
cfg.c
cfg.h
fw.c
fw.h
hermes.c
hermes.h
hermes_dld.c
hermes_dld.h
hermes_rid.h
hw.c orinoco: Fix walking past the end of the buffer 2010-08-25 14:33:17 -04:00
hw.h
main.c
main.h
mic.c
mic.h
orinoco.h
orinoco_cs.c pcmcia: remove obsolete and wrong comments 2010-09-29 17:20:25 +02:00
orinoco_nortel.c
orinoco_pci.c
orinoco_pci.h
orinoco_plx.c
orinoco_tmd.c
orinoco_usb.c
scan.c
scan.h
spectrum_cs.c pcmcia: remove obsolete and wrong comments 2010-09-29 17:20:25 +02:00
wext.c orinoco: Fix walking past the end of the buffer 2010-08-25 14:33:17 -04:00
wext.h