Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Mar 2010 21:41:48 +0000 (14:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Mar 2010 21:41:48 +0000 (14:41 -0700)
commit7b12887244293eb54acd07c6296b830b3af0f6da
tree7af1b624b3248d5a9e38c787f998dc63738b85ab
parent6631424fd2efd75e7394b318ad2a8597327857a9
parentbc8a67386fd462914269fa93446e1891955a8bb3
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