summaryrefslogtreecommitdiffstats
path: root/net/ipv4/xfrm4_mode_tunnel.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-13 00:35:30 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-13 00:35:30 +0100
commitec2f9d1331f658433411c58077871e1eef4ee1b4 (patch)
tree6d0e5f6665e5c89ee392379967a52e6fcae17cf2 /net/ipv4/xfrm4_mode_tunnel.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parent[SPARC]: Re-export saved_command_line to modules. (diff)
downloadlinux-ec2f9d1331f658433411c58077871e1eef4ee1b4.tar.xz
linux-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/ipv4/xfrm4_mode_tunnel.c')
0 files changed, 0 insertions, 0 deletions