]> err.no Git - linux-2.6/commitdiff
Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 1 Dec 2005 07:22:47 +0000 (02:22 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 1 Dec 2005 07:22:47 +0000 (02:22 -0500)
1  2 
drivers/net/sk98lin/h/skdrv2nd.h
drivers/net/sk98lin/skge.c

Simple merge
Simple merge