From: Linus Torvalds Date: Tue, 8 May 2007 18:58:20 +0000 (-0700) Subject: Merge branch 'reset-seq' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libat... X-Git-Tag: v2.6.22-rc1~354 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4750def52cb2c21732dda9aa1d43a07db37b0186;p=linux-2.6 Merge branch 'reset-seq' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'reset-seq' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [libata reset-seq] build and merge fixes libata: reimplement reset sequencing libata: improve ata_std_prereset() libata: improve 0xff status handling libata: add deadline support to prereset and reset methods --- 4750def52cb2c21732dda9aa1d43a07db37b0186