diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:58:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:58:20 -0700 |
| commit | 4750def52cb2c21732dda9aa1d43a07db37b0186 (patch) | |
| tree | 29fd6223665faabb593f8ae1f4f626685f425ff9 /fs/xfs/linux-2.6/mrlock.h | |
| parent | 9028780a3e6d2c3dd940e89b377765cca008b6df (diff) | |
| parent | 27c78b372d05e47bbd059c9bb003c6d716abff54 (diff) | |
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/linux-2.6/mrlock.h')
0 files changed, 0 insertions, 0 deletions