Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 13 Dec 2005 05:07:46 +0000 (00:07 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 13 Dec 2005 05:07:46 +0000 (00:07 -0500)
commit783e3385a134305d49d7b431df6e591265e7ec14
tree7db0b8f854201e2ad343ea5b1c6fab7c3bca5a9b
parentfd803241744ad6e4262b6588c6af89e8fb794098
parent1cf9e8a7865c0ac216034e519cf6b8505055ea50
Merge branch 'upstream-fixes'
drivers/net/sk98lin/skge.c