From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Mar 2010 21:41:48 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: MMI-PSA29.97-13-9~24247
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7b12887244293eb54acd07c6296b830b3af0f6da;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_via: fix VT6410/6415/6330 detection issue
---

7b12887244293eb54acd07c6296b830b3af0f6da