Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Apr 2010 15:36:31 +0000 (08:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Apr 2010 15:36:31 +0000 (08:36 -0700)
commitab195c58b864802c15e494f06ae109413e12d50b
tree7b86a6c2a673323b0a90cae227f9fc023eb5b3ff
parentcb4361c1dc29cd870f664c004b1817106fbce0fa
parent445d211b0da4e9a6e6d576edff85085c2aaf53df
Merge branch 'upstream-linus' of git://git./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