Merge branch 'linville-e1000' of git://git.tuxdriver.com/git/netdev-jwl