FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-24 10:28:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
25901632c9
linux/net/can
History
David S. Miller 3a07bd6fea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/mellanox/mlx4/main.c
	net/packet/af_packet.c

Both conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-06-24 02:58:51 -07:00
..
af_can.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-06-24 02:58:51 -07: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 can: cangw: introduce optional uid to reference created routing jobs 2015-06-09 09:39:49 +02:00
Kconfig
Makefile
proc.c can: add hash based access to single EFF frame filters 2014-05-19 09:38:24 +02:00
raw.c can: introduce new raw socket option to join the given CAN filters 2015-04-01 11:28:22 +02:00