Linus Torvalds 038a5008b2 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (867 commits)
  [SKY2]: status polling loop (post merge)
  [NET]: Fix NAPI completion handling in some drivers.
  [TCP]: Limit processing lost_retrans loop to work-to-do cases
  [TCP]: Fix lost_retrans loop vs fastpath problems
  [TCP]: No need to re-count fackets_out/sacked_out at RTO
  [TCP]: Extract tcp_match_queue_to_sack from sacktag code
  [TCP]: Kill almost unused variable pcount from sacktag
  [TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L
  [TCP]: Add bytes_acked (ABC) clearing to FRTO too
  [IPv6]: Update setsockopt(IPV6_MULTICAST_IF) to support RFC 3493, try2
  [NETFILTER]: x_tables: add missing ip6t_modulename aliases
  [NETFILTER]: nf_conntrack_tcp: fix connection reopening
  [QETH]: fix qeth_main.c
  [NETLINK]: fib_frontend build fixes
  [IPv6]: Export userland ND options through netlink (RDNSS support)
  [9P]: build fix with !CONFIG_SYSCTL
  [NET]: Fix dev_put() and dev_hold() comments
  [NET]: make netlink user -> kernel interface synchronious
  [NET]: unify netlink kernel socket recognition
  [NET]: cleanup 3rd argument in netlink_sendskb
  ...

Fix up conflicts manually in Documentation/feature-removal-schedule.txt
and my new least favourite crap, the "mod_devicetable" support in the
files include/linux/mod_devicetable.h and scripts/mod/file2alias.c.

(The latter files seem to be explicitly _designed_ to get conflicts when
different subsystems work with them - that have an absolutely horrid
lack of subsystem separation!)

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-11 19:40:14 -07:00
..
2007-07-31 15:39:39 -07:00
2007-04-01 10:10:04 -05:00
2007-07-31 10:34:34 -05:00
2006-09-12 17:12:31 -05:00
2006-09-12 17:12:31 -05:00
2007-05-06 09:33:11 -05:00
2007-09-25 20:55:02 -05:00
2006-08-06 15:59:26 -05:00
2006-11-15 16:41:27 -06:00
2007-07-31 10:36:30 -05:00
2007-07-31 10:36:30 -05:00
2006-09-12 17:12:31 -05:00
2007-08-01 08:51:32 -05:00
2007-05-24 09:14:41 -05:00
2007-05-31 17:30:04 -04:00
2007-08-22 19:52:45 -07:00
2007-07-21 17:49:16 -07:00
2006-09-12 17:12:31 -05:00
2006-11-30 05:24:39 +01:00
2007-07-20 08:24:49 -07:00
2007-05-24 09:13:25 -05:00
2007-04-17 18:15:04 -04:00
2007-02-09 09:14:07 -08:00
2007-07-21 17:49:16 -07:00
2007-07-18 11:16:32 -05:00
2007-07-21 08:58:23 -05:00
2007-07-18 11:16:32 -05:00
2007-08-04 08:37:04 -05:00
2007-05-28 09:08:32 -05:00
2007-07-14 19:12:15 -05:00
2006-03-23 07:38:09 -08:00
2007-07-31 10:44:01 -05:00
2007-07-31 10:44:01 -05:00
2007-05-31 17:30:04 -04:00
2006-11-15 16:43:50 -06:00
2007-07-18 11:16:38 -05:00