Merge branch 'master' into upstream-fixes

diff --cc drivers/net/b44.c
Simple merge

diff --cc drivers/net/forcedeth.c
Simple merge

diff --cc drivers/net/ibmveth.c
Simple merge

diff --cc drivers/net/mv643xx_eth.c
Simple merge

diff --cc drivers/net/sky2.c
Simple merge