Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
commit5a17558f06993fdc509362f659582b52b0f921e3
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Mar 2008 03:02:32 +0000 (24 20:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Mar 2008 03:02:32 +0000 (24 20:02 -0700)
treed8c54416aff225097dee41f6cd0dd997639a4b28
parentd56dc0b641da647012af573dac4a5fa7b9883fe0
parent4cde32fc4b32e96a99063af3183acdfd54c563f0
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] ahci: SB600 workaround is suspect... play it safe for now
  sata_promise: fix hardreset hotplug events, take 2
  libata: improve HPA error handling
  libata: assume no device is attached if both IDENTIFYs are aborted
  pata_it821x: use raw nbytes in check_atapi_dma
  libata: implement ata_qc_raw_nbytes()