From: Linus Torvalds Date: Wed, 24 May 2006 15:36:31 +0000 (-0700) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.17-rc5~4 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=278654541017bc93befe3570edeabd5d9e95e4ea;p=karo-tx-linux.git Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] libata: add pio flush for via atapi (was: Re: TR: ASUS A8V Deluxe, x86_64) --- 278654541017bc93befe3570edeabd5d9e95e4ea