kernel-ark/drivers/net/ethernet/smsc
David S. Miller f24001941c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Fix merge between commit 3adadc08cc ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d ("net ax25: Simplify and
cleanup the ax25 sysctl handling")

The former moved around the sysctl register/unregister calls, the
later simply removed them.

With help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-23 23:15:17 -04:00
..
epic100.c epic100: stop using net_device.{base_addr, irq} and convert to __iomem. 2012-04-07 11:47:18 +02:00
Kconfig
Makefile
smc91c92_cs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
smc91x.c Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm 2012-03-27 18:17:02 -07:00
smc91x.h
smc911x.c netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-08 18:46:38 -05:00
smc911x.h
smc9194.c netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-08 18:46:38 -05:00
smc9194.h
smsc911x.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-04-23 23:15:17 -04:00
smsc911x.h smsc911x: Unconditionally include linux/smscphy.h in smsc911x.h 2012-01-07 12:22:11 -08:00
smsc9420.c smsc9420: stop using net_device.{base_addr, irq}. 2012-04-07 11:47:16 +02:00
smsc9420.h