summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_tunnel.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-11-12 14:49:15 -0500
committerDavid S. Miller <davem@davemloft.net>2014-11-12 14:49:15 -0500
commitfeed1a96604e2d067c556ec97a92f82ae0e449ad (patch)
tree0ce6d6b85118b8a9c602560099d12437c50dff19 /net/ipv4/ip_tunnel.c
parentd3f15dbd42d6d22237104df5a23151332c1b7585 (diff)
parenta1f83feecc9e754eac5286844e7d7dcc58a0aceb (diff)
downloadlinux-feed1a96604e2d067c556ec97a92f82ae0e449ad.tar.gz
linux-feed1a96604e2d067c556ec97a92f82ae0e449ad.tar.bz2
linux-feed1a96604e2d067c556ec97a92f82ae0e449ad.zip
Merge branch 'r8152-next'
Hayes Wang says: ==================== Code adjustment v3: Remove the test_bit for patch #2. v2: Correct the spelling error for the comment of patch #3. v1: Adjust some codes to make them more reasonable. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_tunnel.c')
0 files changed, 0 insertions, 0 deletions