diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 16:25:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 16:25:58 -0700 |
| commit | 91cd99f677ada2af90b06cb1f59e99f27ade5740 (patch) | |
| tree | b721c3216f9a33a44efede51831398bd24f9e858 /Makefile | |
| parent | 5b0dac745f2e43836e8fb2920391834d8a8f7fed (diff) | |
| parent | e550dfb0c2c31b6363aa463a035fc9f8dcaa3c9b (diff) | |
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