linux/drivers/net/ethernet/intel
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
..
e1000 e1000: Support RX-ALL flag. 2012-04-04 00:21:27 -07:00
e1000e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-04-15 13:19:04 -04:00
igb igb: Update version to 3.4.7. 2012-04-14 02:07:13 -07:00
igbvf intel: make wired ethernet driver message level consistent (rev2) 2012-03-27 23:29:22 -07:00
ixgb intel: make wired ethernet driver message level consistent (rev2) 2012-03-27 23:29:22 -07:00
ixgbe Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-04-23 23:15:17 -04:00
ixgbevf intel: make wired ethernet driver message level consistent (rev2) 2012-03-27 23:29:22 -07:00
e100.c e100: enable transmit time stamping. 2012-04-14 02:02:41 -07:00
Kconfig net: remove ixp2000 ethernet driver 2012-04-04 18:09:37 -04:00
Makefile