diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /Documentation/conf.py | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'Documentation/conf.py')
| -rw-r--r-- | Documentation/conf.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/conf.py b/Documentation/conf.py index 96b7aa66c89c..106ae9c740b9 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py | |||
| @@ -131,7 +131,7 @@ pygments_style = 'sphinx' | |||
| 131 | todo_include_todos = False | 131 | todo_include_todos = False |
| 132 | 132 | ||
| 133 | primary_domain = 'C' | 133 | primary_domain = 'C' |
| 134 | highlight_language = 'C' | 134 | highlight_language = 'guess' |
| 135 | 135 | ||
| 136 | # -- Options for HTML output ---------------------------------------------- | 136 | # -- Options for HTML output ---------------------------------------------- |
| 137 | 137 | ||