diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-26 15:47:03 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-26 15:47:03 -0400 |
| commit | 1e1b37273cf719545da50b76f214f983a710aaf4 (patch) | |
| tree | 033f6062325ef7aaeefe8559bb409ab7d2be3c76 /Documentation/conf.py | |
| parent | c183a603e8d8a5a189729b77d0c623a3d5950e5f (diff) | |
| parent | c291b015158577be533dd5a959dfc09bab119eed (diff) | |
Merge branch 'x86/urgent' into x86/apic
Bring in the upstream modifications so we can fixup the silent merge
conflict which is introduced by this merge.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 | ||