diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-30 09:32:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-30 09:32:26 -0800 |
| commit | 238d1d0f79f619d75c2cc741d6770fb0986aef24 (patch) | |
| tree | ed11bb89c3c61cba7aff3ebc90647f83758a982d /net/phonet/Makefile | |
| parent | f3de082c12e5e9ff43c58a7561f6ec3272d03a48 (diff) | |
| parent | 36f671be1db1b17d3d4ab0c8b47f81ccb1efcb75 (diff) | |
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
Diffstat (limited to 'net/phonet/Makefile')