David S. Miller 0fa74a4be4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be_main.c net/core/sysctl_net_core.c net/ipv4/inet_diag.c The be_main.c conflict resolution was really tricky. The conflict hunks generated by GIT were very unhelpful, to say the least. It split functions in half and moved them around, when the real actual conflict only existed solely inside of one function, that being be_map_pci_bars(). So instead, to resolve this, I checked out be_main.c from the top of net-next, then I applied the be_main.c changes from 'net' since the last time I merged. And this worked beautifully. The inet_diag.c and sysctl_net_core.c conflicts were simple overlapping changes, and were easily to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-20 18:51:09 -04:00
..
epic100.c	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
Kconfig	net: smc91x: Add Atari EtherNAT support	2015-01-15 19:32:58 -05:00
Makefile
smc91c92_cs.c	net: smc91c92_cs: Use setup_timer and mod_timer	2015-03-01 13:40:22 -05:00
smc91x.c	Revert "smc91x: retrieve IRQ and trigger flags in a modern way"	2015-03-17 15:04:57 -04:00
smc91x.h	net: smc91x: use run-time configuration on all ARM machines	2015-02-28 12:56:56 -05:00
smc911x.c	net: ethernet: smsc: drop owner assignment from platform_drivers	2014-10-20 16:21:12 +02:00
smc911x.h	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
smc9194.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-11-13 17:40:34 +09:00
smc9194.h
smsc911x.c	ethernet: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
smsc911x.h	smsc: replace WARN_ON() with WARN_ON_SMP()	2014-08-11 14:38:29 -07:00
smsc9420.c	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
smsc9420.h	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00