Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
commit35b5c55fee08e6e4001ba98060a2d0b82f70b5f4
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Jul 2009 17:29:09 +0000 (15 10:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Jul 2009 17:29:09 +0000 (15 10:29 -0700)
treea50b920260c7ccdb2da90bd6a064de168280beeb
parente9e961c9a818a2f24711af493b907a8e40a69efc
parentb2dde6afe5d29212d521e69492ebc299db235001
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:
  ahci: add device ID for 82801JI sata controller
  drivers/ata: Move a dereference below a NULL test
  libata: implement and use HORKAGE_NOSETXFER, take#2
  libata: fix follow-up SRST failure path