aboutsummaryrefslogtreecommitdiff
path: root/net/ipv6
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-20 10:18:44 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-20 10:18:44 -0700
commitfb65a7c091529bfffb1262515252c0d0f6241c5c (patch)
tree021a043df0e0d328c509c0e8fb74429cbce006c7 /net/ipv6
parent175f9c1bba9b825d22b142d183c9e175488b260c (diff)
iucv: Fix bad merging.
Noticed by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
0 files changed, 0 insertions, 0 deletions