aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/cipso_ipv4.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-07-07 20:07:05 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-07 20:07:05 -0400
commit0b88e7042a221a0318d726017b0f97aa42066826 (patch)
treed7bde139634d8d90cddaa730abe37a8bf17e2aeb /net/ipv4/cipso_ipv4.c
parentb98fe24ca7d0effdd4c47a9f681d9e4f10442827 (diff)
parent9162e7e5197e14c7488c54980d7cbdc2071f8085 (diff)
Merge branch 'tlan-next'
Ondrej Zary says: ==================== tlan: Link handling improvements and Olicom fixes This patch series improves link handling in tlan driver, allowing the cable to be (un)plugged anytime and NetworkManager to work properly. Also there are some bugfixes related to Olicom OC-2326 card. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/cipso_ipv4.c')
0 files changed, 0 insertions, 0 deletions