diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 15:35:30 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 15:35:30 -0800 |
commit | ec2f9d1331f658433411c58077871e1eef4ee1b4 (patch) | |
tree | 6d0e5f6665e5c89ee392379967a52e6fcae17cf2 /net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | [SPARC]: Re-export saved_command_line to modules. (diff) | |
download | linux-dev-ec2f9d1331f658433411c58077871e1eef4ee1b4.tar.xz linux-dev-ec2f9d1331f658433411c58077871e1eef4ee1b4.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Re-export saved_command_line to modules.
[SPARC64]: Increase command line size to 2048 like other arches.
[SPARC64]: We do not need ZONE_DMA.
Diffstat (limited to 'net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c')
0 files changed, 0 insertions, 0 deletions