Commits

Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream Conflicts: drivers/net/e1000/e1000_main.c
Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream Conflicts: drivers/net/e1000/e1000_main.c