diff options
author | Linus Torvalds | 2007-05-08 20:58:20 +0200 |
---|---|---|
committer | Linus Torvalds | 2007-05-08 20:58:20 +0200 |
commit | 4750def52cb2c21732dda9aa1d43a07db37b0186 (patch) | |
tree | 29fd6223665faabb593f8ae1f4f626685f425ff9 /fs/xfs/xfs_iomap.h | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
parent | [libata reset-seq] build and merge fixes (diff) | |
download | kernel-qcow2-linux-4750def52cb2c21732dda9aa1d43a07db37b0186.tar.gz kernel-qcow2-linux-4750def52cb2c21732dda9aa1d43a07db37b0186.tar.xz kernel-qcow2-linux-4750def52cb2c21732dda9aa1d43a07db37b0186.zip |
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
Diffstat (limited to 'fs/xfs/xfs_iomap.h')
0 files changed, 0 insertions, 0 deletions