]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 21 Sep 2006 04:08:25 +0000 (00:08 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 21 Sep 2006 04:08:25 +0000 (00:08 -0400)
1  2 
drivers/net/lp486e.c
drivers/net/mv643xx_eth.c

Simple merge
Simple merge