FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-29 13:00:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
fd9514572f
linux/net/rose
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_rose.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-06-24 02:58:51 -07:00
Makefile
rose_dev.c net: Kill dev_rebuild_header 2015-03-02 16:43:41 -05:00
rose_in.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
rose_link.c netfilter: Remove spurios included of netfilter.h 2015-06-18 21:14:32 +02:00
rose_loopback.c rose: Add length checks to CALL_REQUEST parsing 2011-03-27 17:59:04 -07:00
rose_out.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
rose_route.c netfilter: Remove spurios included of netfilter.h 2015-06-18 21:14:32 +02:00
rose_subr.c net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
rose_timer.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
sysctl_net_rose.c net: Convert uses of typedef ctl_table to struct ctl_table 2013-06-13 02:36:09 -07:00