Merge branch 'docs/msi-3' of git://github.com/mfwitten/linux-2.6 into docs-move
Randy Dunlap [Wed, 3 Aug 2011 21:35:47 +0000 (14:35 -0700)]

Trivial merge