Merge branch 'e1000' of ssh://198.78.49.142/srv/git/intel/linux-2.6