]> err.no Git - linux-2.6/commit
Merge branch 'upstream-fixes'
authorJeff Garzik <jeff@garzik.org>
Sat, 4 Mar 2006 17:07:07 +0000 (12:07 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 4 Mar 2006 17:07:07 +0000 (12:07 -0500)
commitfb15b9dd8b3f44290a7b3b06fdfd4be2ad73f0ac
treecab2d85fb0ebfa33ee20e5738e11f58c0b1e16cd
parentc3cf560e35509634d72cf809074834d5ea23ab66
parenta7a80d5ad3735554338199b9d976dfda5c10d3c7
Merge branch 'upstream-fixes'
drivers/net/s2io.c