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
..
2008-12-25 13:38:55 +01:00
2010-08-09 18:12:53 +02:00
2010-02-09 11:13:56 +01:00
2009-09-11 10:29:56 +02:00
2010-02-26 22:37:29 +01:00
2009-03-26 15:24:05 +01:00
2009-12-16 07:20:12 -08:00
2008-12-25 13:39:06 +01:00
2010-10-07 14:08:55 +01:00
2008-12-25 13:38:57 +01:00
2010-08-14 22:26:51 +02:00
2010-06-09 11:12:36 +02:00
2009-09-22 07:17:42 -07:00
2010-02-26 22:37:30 +01:00
2010-09-08 14:31:00 -07:00
2009-06-12 10:27:31 +02:00
2010-08-09 16:48:44 -04:00
2010-05-17 10:00:17 +02:00
2009-03-26 15:24:05 +01:00