luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4963ed48f2
tmp_suning_uos_patched/drivers/net/arcnet
History
David S. Miller 4963ed48f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/ipv4/arp.c

The net/ipv4/arp.c conflict was one commit adding a new
local variable while another commit was deleting one.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-26 16:08:27 -07:00
..
arc-rawmode.c arcnet: arc-rawmode: reorder module functions 2015-09-23 11:23:44 +02:00
arc-rimi.c arcnet: Add com9026.h to standardize COM9026_REG_<foo> 2015-09-23 08:44:27 +02:00
arcdevice.h arcnet: com20020: replace magic numbers with readable macros 2015-09-23 08:44:28 +02:00
arcnet.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-09-26 16:08:27 -07:00
capmode.c arcnet: capmode: remove extra function 2015-09-23 11:23:45 +02:00
com90io.c arcnet: Add com9026.h to standardize COM9026_REG_<foo> 2015-09-23 08:44:27 +02:00
com90xx.c arcnet: Add com9026.h to standardize COM9026_REG_<foo> 2015-09-23 08:44:27 +02:00
com9026.h arcnet: Add com9026.h to standardize COM9026_REG_<foo> 2015-09-23 08:44:27 +02:00
com20020_cs.c arcnet: com20020: Use arcnet_<I/O> routines 2015-09-23 08:44:26 +02:00
com20020-isa.c arcnet: com20020: Use arcnet_<I/O> routines 2015-09-23 08:44:26 +02:00
com20020-pci.c arcnet: reformat structs to C99 format 2015-09-23 08:44:28 +02:00
com20020.c arcnet: com20020: replace magic numbers with readable macros 2015-09-23 08:44:28 +02:00
com20020.h arcnet: com20020: replace magic numbers with readable macros 2015-09-23 08:44:28 +02:00
Kconfig drivers/net: remove all references to obsolete Ethernet-HOWTO 2015-06-23 06:50:35 -07:00
Makefile com20020_cs: Move the PCMCIA Arcnet driver 2011-08-27 00:58:44 -07:00
rfc1051.c arcnet: Move files out of include/linux 2015-09-23 08:44:25 +02:00
rfc1201.c arcnet: Move files out of include/linux 2015-09-23 08:44:25 +02:00