tree 5ea72d40c55890b3c1c944fa4ef8dd386e6e7ba5
parent ad2e62a038c392a3453712fbb42fd71faacc203a
parent 78981a7c6c34bddbb90da72cf6ce10953e84aad8
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1170175577 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1170175577 -0800

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: fix translation for START STOP UNIT
  libata-scsi: ata_task_ioctl should return ATA registers from sense data
  pata_platform: set_mode fix
  ata_if_xfermask() word 51 fix
  pata_sil680: PIO1 taskfile transfers overclocking fix (repost)
  libata: fix ata_eh_suspend() return value
  ahci: port_no should be used when clearing IRQ in ahci_thaw()

Fix trivial conflict in drivers/ata/pata_platform.c manually