OpenCloudOS-Kernel/drivers/net/ethernet/neterion
David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of conflicts, by happily all cases of overlapping
changes, parallel adds, things of that nature.

Thanks to Stephen Rothwell, Saeed Mahameed, and others
for their guidance in these resolutions.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-12-20 11:53:36 -08:00
..
vxge Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-12-20 11:53:36 -08:00
Kconfig net: documentation: build a directory structure for drivers 2018-12-05 11:30:06 -08:00
Makefile
s2io-regs.h
s2io.c net: neterion: remove redundant continue 2018-09-21 09:00:55 -07:00
s2io.h net: neterion: s2io: Use linux/io-64-nonatomic-lo-hi.h 2018-09-18 20:06:23 -07:00