]> 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>
Tue, 4 Nov 2008 16:19:01 +0000 (08:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Nov 2008 16:19:01 +0000 (08:19 -0800)
commit8a6d583533cdabff1c92a1b07f0a76e2733151dd
tree09abc81bdc493783d3962a66fc857aee4f5e4b4e
parentfed07c7a933668787d634fb90824204c554014eb
parente07f02ae01afd3d1d4bf49fcc26c37a798c6adac
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:
  libata: mask off DET when restoring SControl for detach
  libata: implement ATA_HORKAGE_ATAPI_MOD16_DMA and apply it
  libata: Fix a potential race condition in ata_scsi_park_show()
  sata_nv: fix generic, nf2/3 detection regression
  sata_via: restore vt*_prepare_host error handling
  sata_promise: add ATA engine reset to reset ops