tree 8ea562077369b97700ebe6af02906690a788bf51
parent a6db522c9399f69ff705c8afae069b5a74a8ea6b
parent 18bc89aa25fbfcf467f4ce67f76c7b9893404cac
author Linus Torvalds <torvalds@g5.osdl.org> 1145571937 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1145571937 -0700

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [EBTABLES]: Clean up vmalloc usage in net/bridge/netfilter/ebtables.c
  [NET]: Add skb->truesize assertion checking.
  [TCP]: Account skb overhead in tcp_fragment
  [SUNGEM]: Marvell PHY suspend.
  [LLC]: Use pskb_trim_rcsum() in llc_fixup_skb().
  [NET]: sockfd_lookup_light() returns random error for -EBADFD