tree 03487f55b11cdfa5d3f0edf655fa2351f7d4ed53
parent a196e7880905313773be97dbca5aa7b0a0aed71c
parent 63903ca6af3d9424a0c2b176f927fa7e7ab2ae8e
author Linus Torvalds <torvalds@g5.osdl.org> 1145408602 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1145408602 -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:
  [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