Merge tag 'docs-fix' of git://git.lwn.net/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Feb 2015 01:02:04 +0000 (17:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Feb 2015 01:02:04 +0000 (17:02 -0800)
commitfbe4da49f86bbc08a1f7994338522bf77d47300d
tree120235a34e33e798e4802fb24244e62e1617f114
parent533cf7aef25bfe5da72170466582bcd0db5189c0
parentc20f29f63ca6271386a568c069e347f65fac7025
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