linux/drivers/net/ethernet/ti
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
..
cpmac.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-19 16:03:15 -05:00
cpsw_ale.c netdev: driver: ethernet: add cpsw address lookup engine support 2012-03-19 18:02:05 -04:00
cpsw_ale.h netdev: driver: ethernet: add cpsw address lookup engine support 2012-03-19 18:02:05 -04:00
cpsw.c cpsw: Hook up default ndo_change_mtu. 2012-03-20 00:33:59 -04:00
davinci_cpdma.c davinci_cpdma: export symbols used by other drivers 2012-04-21 15:28:47 -04:00
davinci_cpdma.h
davinci_emac.c davinci_emac: Support the get_ts_info ethtool method. 2012-04-04 05:28:46 -04:00
davinci_mdio.c davinci_mdio: Fix MDIO timeout check 2012-04-17 22:31:59 -04:00
Kconfig netdev: driver: ethernet: Add TI CPSW driver 2012-03-19 18:02:05 -04:00
Makefile netdev: driver: ethernet: Add TI CPSW driver 2012-03-19 18:02:05 -04:00
tlan.c net: Fix spelling typo in net 2012-04-14 15:29:02 -04:00
tlan.h