diff options
author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-21 22:03:15 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-21 22:03:15 -0400 |
commit | e899966f626f1f657a4a7bac736c0b9ae5a243ea (patch) | |
tree | a4bb8362d871da67b41fee27bb85ad0bc83e0591 /Documentation/DocBook | |
parent | ba0d342ecc21fbbe2f6c178f4479944d1fb34f3b (diff) | |
parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) |
Merge tag 'v3.15-rc6' into patchwork
Linux 3.15-rc6
* tag 'v3.15-rc6': (1314 commits)
Linux 3.15-rc6
Btrfs: send, fix incorrect ref access when using extrefs
Btrfs: fix EIO on reading file after ioctl clone works on it
scripts/checksyscalls.sh: Make renameat optional
asm-generic: Add renameat2 syscall
ia64: add renameat2 syscall
parisc: add renameat2 syscall
m68k: add renameat2 syscall
sysfs: make sure read buffer is zeroed
ahci: imx: PLL clock needs 100us to settle down
PCI: Wrong register used to check pending traffic
target: fix memory leak on XCOPY
random: fix BUG_ON caused by accounting simplification
clk: tegra: Fix wrong value written to PLLE_AUX
staging: rtl8723au: Do not reset wdev->iftype in netdev_close()
ACPI / video: Revert native brightness quirk for ThinkPad T530
staging: rtl8723au: Use correct pipe type for USB interrupts
crush: decode and initialize chooseleaf_vary_r
libceph: fix corruption when using page_count 0 page in rbd
arm64: fix pud_huge() for 2-level pagetables
...
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/device-drivers.tmpl | 10 | ||||
-rw-r--r-- | Documentation/DocBook/drm.tmpl | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl index f5170082bdb3..cc63f30de166 100644 --- a/Documentation/DocBook/device-drivers.tmpl +++ b/Documentation/DocBook/device-drivers.tmpl | |||
@@ -276,7 +276,7 @@ X!Isound/sound_firmware.c | |||
276 | </para> | 276 | </para> |
277 | 277 | ||
278 | <sect1><title>Frame Buffer Memory</title> | 278 | <sect1><title>Frame Buffer Memory</title> |
279 | !Edrivers/video/fbmem.c | 279 | !Edrivers/video/fbdev/core/fbmem.c |
280 | </sect1> | 280 | </sect1> |
281 | <!-- | 281 | <!-- |
282 | <sect1><title>Frame Buffer Console</title> | 282 | <sect1><title>Frame Buffer Console</title> |
@@ -284,7 +284,7 @@ X!Edrivers/video/console/fbcon.c | |||
284 | </sect1> | 284 | </sect1> |
285 | --> | 285 | --> |
286 | <sect1><title>Frame Buffer Colormap</title> | 286 | <sect1><title>Frame Buffer Colormap</title> |
287 | !Edrivers/video/fbcmap.c | 287 | !Edrivers/video/fbdev/core/fbcmap.c |
288 | </sect1> | 288 | </sect1> |
289 | <!-- FIXME: | 289 | <!-- FIXME: |
290 | drivers/video/fbgen.c has no docs, which stuffs up the sgml. Comment | 290 | drivers/video/fbgen.c has no docs, which stuffs up the sgml. Comment |
@@ -294,11 +294,11 @@ X!Idrivers/video/fbgen.c | |||
294 | </sect1> | 294 | </sect1> |
295 | KAO --> | 295 | KAO --> |
296 | <sect1><title>Frame Buffer Video Mode Database</title> | 296 | <sect1><title>Frame Buffer Video Mode Database</title> |
297 | !Idrivers/video/modedb.c | 297 | !Idrivers/video/fbdev/core/modedb.c |
298 | !Edrivers/video/modedb.c | 298 | !Edrivers/video/fbdev/core/modedb.c |
299 | </sect1> | 299 | </sect1> |
300 | <sect1><title>Frame Buffer Macintosh Video Mode Database</title> | 300 | <sect1><title>Frame Buffer Macintosh Video Mode Database</title> |
301 | !Edrivers/video/macmodes.c | 301 | !Edrivers/video/fbdev/macmodes.c |
302 | </sect1> | 302 | </sect1> |
303 | <sect1><title>Frame Buffer Fonts</title> | 303 | <sect1><title>Frame Buffer Fonts</title> |
304 | <para> | 304 | <para> |
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 702c4474919c..677a02553ec0 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl | |||
@@ -2287,6 +2287,11 @@ void intel_crt_init(struct drm_device *dev) | |||
2287 | !Edrivers/gpu/drm/drm_crtc_helper.c | 2287 | !Edrivers/gpu/drm/drm_crtc_helper.c |
2288 | </sect2> | 2288 | </sect2> |
2289 | <sect2> | 2289 | <sect2> |
2290 | <title>Output Probing Helper Functions Reference</title> | ||
2291 | !Pdrivers/gpu/drm/drm_probe_helper.c output probing helper overview | ||
2292 | !Edrivers/gpu/drm/drm_probe_helper.c | ||
2293 | </sect2> | ||
2294 | <sect2> | ||
2290 | <title>fbdev Helper Functions Reference</title> | 2295 | <title>fbdev Helper Functions Reference</title> |
2291 | !Pdrivers/gpu/drm/drm_fb_helper.c fbdev helpers | 2296 | !Pdrivers/gpu/drm/drm_fb_helper.c fbdev helpers |
2292 | !Edrivers/gpu/drm/drm_fb_helper.c | 2297 | !Edrivers/gpu/drm/drm_fb_helper.c |