Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Nov 2006 16:05:59 +0000 (08:05 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Nov 2006 16:05:59 +0000 (08:05 -0800)
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] sata_via: fix obvious typo


Trivial merge