| commit | ab195c58b864802c15e494f06ae109413e12d50b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 06 08:36:31 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 06 08:36:31 2010 -0700 |
| tree | 7b86a6c2a673323b0a90cae227f9fc023eb5b3ff | |
| parent | cb4361c1dc29cd870f664c004b1817106fbce0fa [diff] | |
| parent | 445d211b0da4e9a6e6d576edff85085c2aaf53df [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: libata: unlock HPA if device shrunk libata: disable NCQ on Crucial C300 SSD libata: don't whine on spurious IRQ