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)
commita64f97f2c351410dfb3099c2369eacf7154b5532
treeb9f132ee5544febc50a9616a4edb52dd89370105
parentb68c5f546e951d718edf611c4bd9853753e4b366
parentcb60736b32a84cbc9525b0bb4df26b04cbfbc8e8
Merge branch 'tmp' into upstream

Conflicts:

drivers/ata/libata-sff.c
drivers/ata/libata-sff.c