projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a196e78 63903ca)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 19 Apr 2006 01:03:22 +0000 (18:03 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 19 Apr 2006 01:03:22 +0000 (18:03 -0700)
commit5c723d26fa223bdb17b9230c77e4e1156884475a
tree03487f55b11cdfa5d3f0edf655fa2351f7d4ed53tree | snapshot
parenta196e7880905313773be97dbca5aa7b0a0aed71ccommit | diff
parent63903ca6af3d9424a0c2b176f927fa7e7ab2ae8ecommit | diff
Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NET]: Remove redundant NULL checks before [kv]free
  unaligned access in sk_run_filter()
  [IPV6]: Clean up hop-by-hop options handler.
  [IPV6] XFRM: Fix decoding session with preceding extension header(s).
  [IPV6] XFRM: Don't use old copy of pointer after pskb_may_pull().
  [IPV6]: Ensure to have hop-by-hop options in our header of &sk_buff.
  [TCP]: Fix truesize underflow
John Crispins staging tree