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)
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_via: fix VT6410/6415/6330 detection issue


Trivial merge