projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a6db522 18bc89a)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 20 Apr 2006 22:25:37 +0000 (15:25 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 20 Apr 2006 22:25:37 +0000 (15:25 -0700)
commitd3d3cf05eda861d807de539cac25bcefee0f9659
tree8ea562077369b97700ebe6af02906690a788bf51tree | snapshot
parenta6db522c9399f69ff705c8afae069b5a74a8ea6bcommit | diff
parent18bc89aa25fbfcf467f4ce67f76c7b9893404caccommit | diff
Merge /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
John Crispins staging tree