]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Jul 2009 17:29:09 +0000 (10:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Jul 2009 17:29:09 +0000 (10:29 -0700)
commitacfe2235f65140df4bb4b5ec61b316b34e39824b
treea50b920260c7ccdb2da90bd6a064de168280beeb
parent1e01b3f45a46779a03e730387d51fc768b43dd98
parent0934883099a6a52054dc80251295932a2dd8f45d
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/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