Merge branch 'master' into upstream-fixes
authorJeff Garzik <jeff@garzik.org>
Wed, 11 Oct 2006 07:56:12 +0000 (03:56 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 11 Oct 2006 07:56:12 +0000 (03:56 -0400)
commit24fcbacedb0d83cabc6761acbecfbf751265ce52
tree7147b206304b028c3cfd5de6317e5c8510098ca9
parent2f614fe04f4463ff22234133319067d7361f54e5
parent53a5fbdc2dff55161a206ed1a1385a8fa8055c34
Merge branch 'master' into upstream-fixes
drivers/net/b44.c
drivers/net/forcedeth.c
drivers/net/ibmveth.c
drivers/net/mv643xx_eth.c
drivers/net/sky2.c