From: Linus Torvalds Date: Wed, 8 Nov 2006 16:05:59 +0000 (-0800) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=464908d7e2a9f77cb50ee905cda8a59e5b4e50e4;p=linux-beck.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: [libata] sata_via: fix obvious typo --- 464908d7e2a9f77cb50ee905cda8a59e5b4e50e4