From: Linus Torvalds Date: Tue, 16 Dec 2008 17:48:53 +0000 (-0800) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... X-Git-Tag: v2.6.28-rc9~13 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7a62b17694e278b1cde659f85aa6149052baa811;p=linux-2.6-omap-h63xx.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: pata_hpt366: no ATAPI DMA pata_hpt366: fix cable detection, libata: fix Seagate NCQ+FLUSH blacklist --- 7a62b17694e278b1cde659f85aa6149052baa811