1
0
Files
linux/include/linux
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
..
2010-08-24 14:57:09 -07:00
2010-08-05 13:26:20 +01:00
2010-08-12 06:38:24 +10:00
2010-10-15 21:18:59 +02:00
2010-09-23 14:33:39 -07:00
2010-08-12 08:43:30 -07:00
2010-08-06 15:36:47 -05:00
2010-08-19 17:18:00 -07:00
2010-08-12 04:14:05 +01:00
2010-10-21 14:47:59 +02:00
2010-09-23 14:33:39 -07:00
2010-08-19 17:18:03 -07:00
2010-08-18 08:35:46 -04:00
2010-09-09 20:46:30 +02:00
2010-10-12 16:53:37 +02:00
2010-08-11 09:23:22 +02:00
2010-08-11 18:21:02 +02:00
2010-08-19 17:18:03 -07:00
2010-09-21 18:04:47 -07:00
2010-08-29 21:57:55 -07:00
2010-08-19 17:16:23 -07:00
2010-09-30 21:16:05 -07:00
2010-08-20 08:55:00 -07:00
2010-08-19 17:18:01 -07:00
2010-08-19 17:18:03 -07:00
2010-08-09 20:45:05 -07:00
2010-10-12 16:53:44 +02:00
2010-10-07 14:08:55 +01:00
2010-10-12 16:39:07 +02:00
2010-08-10 11:49:21 -07:00
2010-08-12 11:27:58 +02:00
2010-10-22 15:34:12 -05:00
2010-08-19 17:18:00 -07:00
2010-09-09 18:57:24 -07:00
2010-08-19 17:18:01 -07:00
2010-10-21 21:18:54 -04:00
2010-08-09 16:48:45 -04:00
2010-08-11 00:29:47 -04:00
2010-10-12 16:53:34 +02:00
2010-10-04 21:10:52 +02:00
2010-10-04 21:10:52 +02:00
2010-10-21 04:26:38 -07:00
2010-08-19 17:18:00 -07:00
2010-08-19 17:18:02 -07:00
2010-10-15 12:45:44 +02:00
2010-08-21 23:40:14 -07:00
2010-08-04 21:53:17 -07:00
2010-08-19 17:18:03 -07:00
2010-09-08 18:16:55 -07:00
2010-08-09 16:47:27 -04:00
2010-10-05 00:29:48 -07:00
2010-09-08 15:04:10 +02:00
2010-10-20 03:02:23 -07:00
2010-10-21 15:44:13 +02:00
2010-10-21 03:09:42 -07:00
2010-10-07 14:08:55 +01:00
2010-08-09 16:48:44 -04:00
2010-09-24 21:27:41 -07:00
2010-08-30 13:23:33 -07:00
2010-10-21 04:11:07 -07:00
2010-09-09 20:41:20 +02:00
2010-10-22 10:20:04 -07:00
2010-10-22 10:16:43 -07:00
2010-08-11 08:59:02 -07:00