Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Feb 2010 15:58:21 +0000 (07:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Feb 2010 15:58:21 +0000 (07:58 -0800)
commit56dca4ceb7b39aa4173aa1cb822c860ced2be1ec
tree8e20946b7247aa32a83619b481f83efe335e7da0
parent73d2eaac8a3f1ec1d6d0a80ea7302a439ca9b933
parent2d68b7fe55d9e19a8a868224ed0dfd6526568521
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] Call flush_dcache_page after PIO data transfers in libata-sff.c
  ahci: add Acer G725 to broken suspend list
  libata: fix ata_id_logical_per_physical_sectors
  libata-scsi passthru: fix bug which truncated LBA48 return values