| commit | 35b5c55fee08e6e4001ba98060a2d0b82f70b5f4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 15 10:29:09 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 15 10:29:09 2009 -0700 |
| tree | a50b920260c7ccdb2da90bd6a064de168280beeb | |
| parent | e9e961c9a818a2f24711af493b907a8e40a69efc [diff] | |
| parent | b2dde6afe5d29212d521e69492ebc299db235001 [diff] |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ahci: add device ID for 82801JI sata controller drivers/ata: Move a dereference below a NULL test libata: implement and use HORKAGE_NOSETXFER, take#2 libata: fix follow-up SRST failure path