diff options
author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 17:12:08 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-06 03:04:45 +0900 |
commit | 6299b669b1340b9f7de2bc2bd565921a1494e7f7 (patch) | |
tree | d5b2dccaf8bee86fc88594df60aafd6e2cf65014 /net/ipv6/ip6mr.c | |
parent | 17f3609c21706b377ad80b5251558ed700c2af17 (diff) | |
download | blackbird-op-linux-6299b669b1340b9f7de2bc2bd565921a1494e7f7.tar.gz blackbird-op-linux-6299b669b1340b9f7de2bc2bd565921a1494e7f7.zip |
sections: fix section conflicts in net/can
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/ipv6/ip6mr.c')
0 files changed, 0 insertions, 0 deletions