diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-21 11:44:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-21 11:44:08 -0400 |
| commit | a19214430d27a3af6f1672ec26f3c893ef899ede (patch) | |
| tree | ecd998eaf216f6e195c65cb050f4335db86b26f6 /drivers/ata/libata.h | |
| parent | b732d9680b7a2968823851f1163507ad9c45c8cb (diff) | |
| parent | b9f75f45a6b46a0ab4eb0857d437a0845871f314 (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:
netns: Don't receive new packets in a dead network namespace.
sctp: Make sure N * sizeof(union sctp_addr) does not overflow.
pppoe: warning fix
ipv6: Drop packets for loopback address from outside of the box.
ipv6: Remove options header when setsockopt's optlen is 0
mac80211: detect driver tx bugs
Diffstat (limited to 'drivers/ata/libata.h')
0 files changed, 0 insertions, 0 deletions