Merge branch 'docs/msi-3' of git://github.com/mfwitten/linux-2.6 into docs-move
authorRandy Dunlap <rdunlap@xenotime.net>
Wed, 3 Aug 2011 21:35:47 +0000 (14:35 -0700)
committerRandy Dunlap <rdunlap@xenotime.net>
Wed, 3 Aug 2011 21:37:30 +0000 (14:37 -0700)

Trivial merge