android_kernel_motorola_sm6225/drivers/net/ethernet/smsc
David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-23 16:49:34 -04:00
..
epic100.c net: epic100: remove unnecessary pci_set_drvdata() 2013-10-22 02:11:53 -04:00
Kconfig net: Move MII out from under NET_CORE and hide it 2013-06-19 22:22:56 -07:00
Makefile smsc: Move the SMC (SMSC) drivers 2011-08-10 20:04:03 -07:00
smc91c92_cs.c drivers/net: use module_pcmcia_driver() in pcmcia drivers 2013-03-15 12:27:33 -07:00
smc91x.c net: smc91x: use dev_get_platdata() 2013-08-30 17:43:37 -04:00
smc91x.h net: smc91x: dont't use SMC_outw for fixing up halfword-aligned data 2013-10-11 17:50:59 -04:00
smc911x.c net: smc911x: use dev_get_platdata() 2013-08-30 17:43:37 -04:00
smc911x.h net: smc911x: use io{read,write}*_rep accessors 2012-12-11 12:49:53 -05:00
smc9194.c drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb 2013-03-09 16:09:19 -05:00
smc9194.h smsc: Move the SMC (SMSC) drivers 2011-08-10 20:04:03 -07:00
smsc911x.c net:drivers/net: Miscellaneous conversions to ETH_ALEN 2013-10-02 17:04:45 -04:00
smsc911x.h smsc911x: Unconditionally include linux/smscphy.h in smsc911x.h 2012-01-07 12:22:11 -08:00
smsc9420.c net: smsc9420: remove unnecessary pci_set_drvdata() 2013-10-22 02:11:53 -04:00
smsc9420.h smsc: Move the SMC (SMSC) drivers 2011-08-10 20:04:03 -07:00