Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2009 22:16:02 +0000 (14:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2009 22:16:02 +0000 (14:16 -0800)
commit0637810f24bad641d3d3f80fd3f63f3baffd9536
tree13ff343e916e925deed298ca4abd1a73fd95c50b
parent51f267739a81db5eb511b95aeae338413690b8a2
parent7dac745b8e367c99175b8f0d014d996f0e5ed9e5
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:
  sata_nv: give up hardreset on nf2
  libata-sff: fix 32-bit PIO ATAPI regression