From: Linus Torvalds Date: Tue, 30 Oct 2007 18:49:13 +0000 (-0700) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~22003 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8c1ee54cb3ff750dc39a5e1db8075e2352bbd1b8;p=mirror_ubuntu-zesty-kernel.git 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 --- 8c1ee54cb3ff750dc39a5e1db8075e2352bbd1b8