diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-21 01:58:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-21 01:58:30 -0400 |
| commit | d8d33c3b8a42fbd9ad23a61498fa5db1d83644e0 (patch) | |
| tree | 049910220a628f04c031ce11fcfd7365e4b23c35 /net/ipv4/ip_tunnel.c | |
| parent | d050de607f062233cf5e75b2e8f40f20c4b04b91 (diff) | |
| parent | 524369e2391f4b422d0efdd11d526a373a11a43a (diff) | |
Merge tag 'linux-can-fixes-for-3.15-20140519' of git://gitorious.org/linux-can/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2014-05-19
this is a pull request for net/master, for the v3.15 release cycle,
with a single patch.
Oliver Hartkopp's patch removes a Kconfig option in the c_can driver,
which was added as a workaround during the v3.15 development. With all
cleanup patches this workaround is not needed anymore.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_tunnel.c')
0 files changed, 0 insertions, 0 deletions