commit 817b33d38f81c8736d39283c35c886ae4668f1af
Merge: 84d88d5 8c185ab
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Sep 30 17:36:45 2009 -0700

    Merge git://git.kernel.org/pub/scm/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.