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)
commit464908d7e2a9f77cb50ee905cda8a59e5b4e50e4
treebfa297c761d9f0b7c593aaefe3bed14c87c11dcd
parent3ee783a3e4867ce5691bfa6a818959e88a50f209
parent68ff6e8e0e203580ecb118319b5a3b53962edf5a
Merge branch 'upstream-linus' of /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