summaryrefslogtreecommitdiffstats
path: root/net/irda
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-08 18:15:49 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-08 18:15:49 -0700
commit81d84a94be8085475c3585596e52b06ccbedd922 (patch)
tree3cfe28d60a3e7fdae5c0b4e5a52792f3cc79a4bc /net/irda
parent7ac7834765e1c888ab06f677d906179858627f26 (diff)
parent50e5d35ce2c4190cead13a091ea1ceab47d29cc2 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [CIPSO]: Fix several unaligned kernel accesses in the CIPSO engine. [NetLabel]: consolidate the struct socket/sock handling to just struct sock [IPV4]: Do not remove idev when addresses are cleared
Diffstat (limited to 'net/irda')
0 files changed, 0 insertions, 0 deletions