diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-10 01:25:58 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-10 01:25:58 +0200 |
commit | 91cd99f677ada2af90b06cb1f59e99f27ade5740 (patch) | |
tree | b721c3216f9a33a44efede51831398bd24f9e858 /Makefile | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
parent | ipv6: Fix OOPS in ip6_dst_lookup_tail(). (diff) | |
download | linux-91cd99f677ada2af90b06cb1f59e99f27ade5740.tar.xz linux-91cd99f677ada2af90b06cb1f59e99f27ade5740.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
ipv6: Fix OOPS in ip6_dst_lookup_tail().
ipsec: Restore larval states and socket policies in dump
[Bluetooth] Reject L2CAP connections on an insecure ACL link
[Bluetooth] Enforce correct authentication requirements
[Bluetooth] Fix reference counting during ACL config stage
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions