]> err.no Git - linux-2.6/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 30 Oct 2007 18:49:13 +0000 (11:49 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 30 Oct 2007 18:49:13 +0000 (11:49 -0700)
commit8c1ee54cb3ff750dc39a5e1db8075e2352bbd1b8
treef49bd934f7e06950a6dd11436a1297cf734fb848
parent97855b49b6bac0bd25f16b017883634d13591d00
parente027bd36c146582cef382364e5c826db93d4427b
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: implement and use ATA_QCFLAG_QUIET
  libata: stop being overjealous about non-IO commands
  libata: flush is an IO command
  sata_promise: cleanups
  sata_promise: ASIC PRD table bug workaround, take 2