diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 17:10:40 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 17:10:40 (GMT) |
| commit | 0f5a2c553d1484141ebb369ecab61894e9cb074f (patch) | |
| tree | ba7667fb37832e1714dc2a8b3b3e45dade4af5cb /kernel | |
| parent | 26adc0d5859788b74f86677538236f807e6d9021 (diff) | |
| parent | 68e3f5dd4db62619fdbe520d36c9ebf62e672256 (diff) | |
| download | linux-fsl-qoriq-0f5a2c553d1484141ebb369ecab61894e9cb074f.tar.xz | |
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:
[CRYPTO] users: Fix up scatterlist conversion errors
[CRYPTO] tcrypt: Move sg_init_table out of timing loops
[NETNS]: Fix get_net_ns_by_pid
[NET]: Marking struct pernet_operations __net_initdata was inappropriate
[INET] ESP: Must #include <linux/scatterlist.h>
[TCP] IPV6: fix softnet build breakage
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions