Merge branch 'tmp' into upstream
authorJeff Garzik <jeff@garzik.org>
Tue, 19 Sep 2006 04:25:50 +0000 (00:25 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 19 Sep 2006 04:25:50 +0000 (00:25 -0400)
Conflicts:

drivers/ata/libata-sff.c


Trivial merge