linux/drivers/net/ethernet/micrel
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
..
Kconfig drivers: misc: Remove MISC_DEVICES config option 2012-01-24 16:24:02 -08:00
Makefile
ks8695net.c netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-06 11:52:27 -05:00
ks8695net.h
ks8842.c drivers/net: add missing __devexit_p() annotations 2012-04-21 15:28:47 -04:00
ks8851.c ks8851: Fix request_irq/free_irq mismatch 2012-04-21 15:55:31 -04:00
ks8851.h drivers/net: fix up stale paths from driver reorg 2012-01-30 12:54:40 -05:00
ks8851_mll.c net/ethernet: ks8851_mll fix rx frame buffer overflow 2012-04-14 15:21:27 -04:00
ksz884x.c ksz884x: don't copy too much in netdev_set_mac_address() 2012-04-19 13:25:03 -04:00