From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Dec 2016 17:32:26 +0000 (-0800)
Subject: Merge tag 'docs-4.10-rc1-fix' of git://git.lwn.net/linux
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=238d1d0f79f619d75c2cc741d6770fb0986aef24;p=linux-beck.git

Merge tag 'docs-4.10-rc1-fix' of git://git.lwn.net/linux

Pull documentation fixes from Jonathan Corbet:
 "Two small fixes:

   - A merge error on my part broke the DocBook build. I've
     requisitioned one of tglx's frozen sharks for appropriate
     disciplinary action and resolved to be more careful about testing
     the DocBook stuff as long as it's still around.

   - Fix an error in unaligned-memory-access.txt"

* tag 'docs-4.10-rc1-fix' of git://git.lwn.net/linux:
  Documentation/unaligned-memory-access.txt: fix incorrect comparison operator
  docs: Fix build failure
---

238d1d0f79f619d75c2cc741d6770fb0986aef24