aboutsummaryrefslogtreecommitdiff
path: root/include/asm-mips/poll.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-18 18:03:22 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-18 18:03:22 -0700
commit5c723d26fa223bdb17b9230c77e4e1156884475a (patch)
tree03487f55b11cdfa5d3f0edf655fa2351f7d4ed53 /include/asm-mips/poll.h
parenta196e7880905313773be97dbca5aa7b0a0aed71c (diff)
parent63903ca6af3d9424a0c2b176f927fa7e7ab2ae8e (diff)
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
Diffstat (limited to 'include/asm-mips/poll.h')
0 files changed, 0 insertions, 0 deletions