summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-20 15:17:55 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-20 15:17:55 -0800
commit1351522b5f627f06e44e781805b5bd5c01566cf3 (patch)
treee44eaf09047de1de798a2939d1cecd2b87253b3a /include
parentd5379e5eddc09f8d172d9d6aa0e5a269a89dc60a (diff)
parent217e2bfab22e740227df09f22165e834cddd8a3b (diff)
Merge tag 'doc-4.10-3' of git://git.lwn.net/linux
Pull documentation fix from Jonathan Corbet: "A single fix for the build system. It would appear that the docutils developers, in their wisdom, broke the API in the 0.13 release. This fix detects the breakage and allows the docs to be built with both the old and new versions" * tag 'doc-4.10-3' of git://git.lwn.net/linux: docs: sphinx-extensions: make rstFlatTable work with docutils 0.13
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions
2=54791b276b4000b307339f269d3bf7db877d536f'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller: "Several small bug fixes and tidies, along with a fix for non-resumable memory errors triggered by userspace" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: Handle PIO & MEM non-resumable errors. sparc64: Zero pages on allocation for mondo and error queues. sparc: Fixed typo in sstate.c. Replaced panicing with panicking sparc: use symbolic names for tsb indexing
Diffstat (limited to 'tools/arch/ia64/include')