]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jul 2009 19:29:39 +0000 (12:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jul 2009 19:29:39 +0000 (12:29 -0700)
commit2e13e5f03538cfded0c463fd60eddd0c8e2cd959
treeb8a8d2e24c86ea2d15caca8851c9427631f72761
parentccf5675a82a72bc1599b9b29cf33f7e391658485
parent5920dadfb4aec6c1372c5570e71bcd3b4837e63c
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: accept late unlocking of HPA
  libata: Updates and fixes for pata_at91 driver
  ata_piix: Add new short cable ID
  ata_piix: Add new laptop short cable IDs
  ahci: add device IDs for Ibex Peak ahci controllers
  libata: remove superfluous NULL pointer checks
  libata: add missing NULL pointer check to ata_eh_reset()
  pata_pcmcia: add CNF-CDROM-ID