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
..
airport.c powerpc/macio: Fix probing of macio devices by using the right of match table 2010-06-02 17:50:38 +10:00
cfg.c drivers/net/wireless: Use wiphy_<level> 2010-07-27 15:14:13 -04:00
cfg.h
fw.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
fw.h
hermes_dld.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 2010-06-11 11:34:06 -07:00
hermes_dld.h
hermes_rid.h
hermes.c orinoco_usb: implement fw download 2010-05-03 14:53:09 -04:00
hermes.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
hw.c orinoco: Fix walking past the end of the buffer 2010-08-25 14:33:17 -04:00
hw.h
Kconfig orinoco: add orinoco_usb driver 2010-05-03 14:53:08 -04:00
main.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
main.h
Makefile orinoco: add orinoco_usb driver 2010-05-03 14:53:08 -04:00
mic.c
mic.h
orinoco_cs.c pcmcia: remove obsolete and wrong comments 2010-09-29 17:20:25 +02:00
orinoco_nortel.c orinoco: allow driver to specify netdev_ops 2010-05-03 14:53:06 -04:00
orinoco_pci.c orinoco: allow driver to specify netdev_ops 2010-05-03 14:53:06 -04:00
orinoco_pci.h
orinoco_plx.c orinoco: allow driver to specify netdev_ops 2010-05-03 14:53:06 -04:00
orinoco_tmd.c orinoco: allow driver to specify netdev_ops 2010-05-03 14:53:06 -04:00
orinoco_usb.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6 2010-07-27 11:59:19 -04:00
orinoco.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
scan.c Merge branch 'master' into for-davem 2010-04-23 14:43:45 -04:00
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