Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 May 2008 05:14:39 +0000 (22:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 May 2008 05:14:39 +0000 (22:14 -0700)
commita0abb93bf9dc590b031a1123f3e6c6c225c1cdd1
tree201dc475cbe3c7eae00fe1cab9615be3b0a0d186
parent9956c1120826bce3b42093099a0149b7f62d0b8a
parent071f92d05967a0c8422f1c8587ce0b4d90a8b447
Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  net: The world is not perfect patch.
  tcp: Make prior_ssthresh a u32
  xfrm_user: Remove zero length key checks.
  net/ipv4/arp.c: Use common hex_asc helpers
  cassini: Only use chip checksum for ipv4 packets.
  tcp: TCP connection times out if ICMP frag needed is delayed
  netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__
  af_key: Fix selector family initialization.
  libertas: Fix ethtool statistics
  mac80211: fix NULL pointer dereference in ieee80211_compatible_rates
  mac80211: don't claim iwspy support
  orinoco_cs: add ID for SpeedStream wireless adapters
  hostap_cs: add ID for Conceptronic CON11CPro
  rtl8187: resource leak in error case
  ath5k: Fix loop variable initializations