diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-21 02:00:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-21 02:00:27 -0400 |
| commit | 2a7ede540785cac631a7e7334701a25e949853a8 (patch) | |
| tree | 3110d635f898a41ba9215fea358655e4349afecd /net/ipv4/ipip.c | |
| parent | 7d10d2610cc02d432168ca0c5d964cd9e85c1b06 (diff) | |
| parent | d08e973a77d128b25e01a08c34d89593fdf222da (diff) | |
Merge tag 'linux-can-next-for-3.16-20140519' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2014-05-19
this is a pull request of 13 patches for net-next/master.
A patch by Dan Carpenter fixes a coccinelle warning in the mcp251x
driver. Jean Delvare contributes three patches to tightening the
Kconfig dependencies for some drivers. Then come three patches by Pavel
Machek that improve the c_can driver support on the socfpga platform.
Sergei Shtylyov's patch brings support for the CAN hardware found on
Renesas R-Car CAN controllers. Four patches by Oliver Hartkopp, the
first cleans up the guard macros in the CAN headers the other three
improve the EFF frame filtering. Maximilian Schneider's patch adds
support for the GS_USB CAN devices.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipip.c')
0 files changed, 0 insertions, 0 deletions