tree 3d16719aa102444337f161c457502704a4967a53
parent ab08ed1770140ebcf1be1657087689832b755874
parent 3be6cbd73f74b4a3da82cc7d6e1688a4ae595fc7
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1192745315 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1192745315 -0700

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] kill ata_sg_is_last()
  Update libata driver for bf548 atapi controller against the 2.6.24 tree.
  libata-sff: Correct use of check_status()
  drivers/ata: add support to Freescale 3.0Gbps SATA Controller
  pata_acpi: fix build breakage if !CONFIG_PM