Merge tag 'docs-fix' of git://git.lwn.net/linux-2.6
Pull DocBook build fix from Jonathan Corbet:
"Fix the DocBook build failure caused by the move of the i2o subsystem
to the staging tree"
* tag 'docs-fix' of git://git.lwn.net/linux-2.6:
Fix docs build failure caused by i2o removal