Merge branch 'e1000' of ssh://198.78.49.142/srv/git/intel/linux-2.6
authorJeff Garzik <[email protected]>
Wed, 1 Mar 2006 06:53:32 +0000 (01:53 -0500)
committerJeff Garzik <[email protected]>
Wed, 1 Mar 2006 06:53:32 +0000 (01:53 -0500)

Trivial merge