From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 1 Oct 2009 00:36:45 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=817b33d38f81c8736d39283c35c886ae4668f1af;p=linux-edison.git

Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  ax25: Fix possible oops in ax25_make_new
  net: restore tx timestamping for accelerated vlans
  Phonet: fix mutex imbalance
  sit: fix off-by-one in ipip6_tunnel_get_prl
  net: Fix sock_wfree() race
  net: Make setsockopt() optlen be unsigned.
---

817b33d38f81c8736d39283c35c886ae4668f1af