summaryrefslogtreecommitdiffstats
path: root/net/ipv6/xfrm6_tunnel.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-01-28 06:13:13 -0800
committerDavid S. Miller <davem@davemloft.net>2010-01-28 06:13:13 -0800
commitce96bc86bf2ee12e8a3bf461ca8027557c1ef42f (patch)
tree7bc59ed51a9517ec39fb6e63f9a92c435f0e5e99 /net/ipv6/xfrm6_tunnel.c
parent05ba712d7eb156009753e18e5116cabd869cc6e2 (diff)
downloadlinux-ce96bc86bf2ee12e8a3bf461ca8027557c1ef42f.tar.bz2
net: merge fixup for qlge_main
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/xfrm6_tunnel.c')
0 files changed, 0 insertions, 0 deletions