]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitfa74b54f1edecad7b8803da12d9a3050f85a7048
tree7b86a6c2a673323b0a90cae227f9fc023eb5b3ff
parent34b6a19e05f34b5ab46d66ffff7673d8de358180
parent9c39237e1bdd6c8ad89dd7dd2b003c456345ed3b
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