linux/drivers/net/wireless/iwmc3200wifi
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
..
bus.h iwmc3200wifi: cleanup unneeded debugfs error handling 2010-05-03 14:46:37 -04:00
cfg80211.c cfg80211/mac80211: allow per-station GTKs 2010-10-06 16:30:40 -04:00
cfg80211.h
commands.c
commands.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
debug.h iwmc3200wifi: fix busted iwm_debugfs_init definition 2010-05-03 16:21:10 -04:00
debugfs.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
eeprom.c
eeprom.h
fw.c
fw.h
hal.c wireless: fix several minor description typos 2010-06-02 16:13:18 -04:00
hal.h
iwm.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
Kconfig
lmac.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
main.c
Makefile iwmc3200wifi: check sparse endianness annotations 2010-04-16 15:47:02 -04:00
netdev.c
rx.c iwm3200wifi: remove comparison to WIFI_IF_NTFY_MAX in iwm_ntf_wifi_if_wrapper 2010-08-16 14:39:48 -04:00
rx.h
sdio.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
sdio.h
trace.c
trace.h
tx.c Merge branch 'master' into for-davem 2010-04-23 14:43:45 -04:00
umac.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00