Merge branch 'e1000-upstream' of git://198.78.49.142/linux-2.6