David S. Miller 3cef5c5b0b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/cadence/macb.c

Overlapping changes in macb driver, mostly fixes and cleanups
in 'net' overlapping with the integration of at91_ether into
macb in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-03-09 23:38:02 -04:00

..

af_can.c

can: add missing initialisations in CAN related skbuffs

2015-03-09 10:22:24 +01:00

af_can.h

can: add hash based access to single EFF frame filters

2014-05-19 09:38:24 +02:00

bcm.c

net: Remove iocb argument from sendmsg and recvmsg

2015-03-02 13:06:31 -05:00

gw.c

netlink: make nlmsg_end() and genlmsg_end() void

2015-01-18 01:03:45 -05:00

Kconfig

can: Kconfig: switch on all CAN protocolls by default

2013-01-26 16:58:58 +01:00

Makefile

can-gw: add netlink based CAN routing

2011-09-16 17:37:51 -04:00

proc.c

can: add hash based access to single EFF frame filters

2014-05-19 09:38:24 +02:00

raw.c

net: Remove iocb argument from sendmsg and recvmsg

2015-03-02 13:06:31 -05:00