diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 15:54:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 15:54:17 -0400 |
commit | 9a9136e270af14da506f66bcafcc506b86a86498 (patch) | |
tree | b4d0a6877d92635134b7a944d0032fbc43227fd2 /Documentation/fb/framebuffer.txt | |
parent | 3960208f9ca0cf6bdb31c21c59ac0526303f8b34 (diff) | |
parent | 7bb2acb76e8168ca5d0bde5a5a56585a11b3525a (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
sound: convert "sound" subdirectory to UTF-8
MAINTAINERS: Add cxacru website/mailing list
include files: convert "include" subdirectory to UTF-8
general: convert "kernel" subdirectory to UTF-8
documentation: convert the Documentation directory to UTF-8
Convert the toplevel files CREDITS and MAINTAINERS to UTF-8.
remove broken URLs from net drivers' output
Magic number prefix consistency change to Documentation/magic-number.txt
trivial: s/i_sem /i_mutex/
fix file specification in comments
drivers/base/platform.c: fix small typo in doc
misc doc and kconfig typos
Remove obsolete fat_cvf help text
Fix occurrences of "the the "
Fix minor typoes in kernel/module.c
Kconfig: Remove reference to external mqueue library
Kconfig: A couple of grammatical fixes in arch/i386/Kconfig
Correct comments in genrtc.c to refer to correct /proc file.
Fix more "deprecated" spellos.
Fix "deprecated" typoes.
...
Fix trivial comment conflict in kernel/relay.c.
Diffstat (limited to 'Documentation/fb/framebuffer.txt')
-rw-r--r-- | Documentation/fb/framebuffer.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/fb/framebuffer.txt b/Documentation/fb/framebuffer.txt index 610e7801207b..b3e3a0356839 100644 --- a/Documentation/fb/framebuffer.txt +++ b/Documentation/fb/framebuffer.txt | |||
@@ -215,11 +215,11 @@ vertical retrace time is the sum of the upper margin, the lower margin and the | |||
215 | vsync length. | 215 | vsync length. |
216 | 216 | ||
217 | +----------+---------------------------------------------+----------+-------+ | 217 | +----------+---------------------------------------------+----------+-------+ |
218 | | | ^ | | | | 218 | | | ↑ | | | |
219 | | | |upper_margin | | | | 219 | | | |upper_margin | | | |
220 | | | ¥ | | | | 220 | | | ↓ | | | |
221 | +----------###############################################----------+-------+ | 221 | +----------###############################################----------+-------+ |
222 | | # ^ # | | | 222 | | # ↑ # | | |
223 | | # | # | | | 223 | | # | # | | |
224 | | # | # | | | 224 | | # | # | | |
225 | | # | # | | | 225 | | # | # | | |
@@ -238,15 +238,15 @@ vsync length. | |||
238 | | # | # | | | 238 | | # | # | | |
239 | | # | # | | | 239 | | # | # | | |
240 | | # | # | | | 240 | | # | # | | |
241 | | # ¥ # | | | 241 | | # ↓ # | | |
242 | +----------###############################################----------+-------+ | 242 | +----------###############################################----------+-------+ |
243 | | | ^ | | | | 243 | | | ↑ | | | |
244 | | | |lower_margin | | | | 244 | | | |lower_margin | | | |
245 | | | ¥ | | | | 245 | | | ↓ | | | |
246 | +----------+---------------------------------------------+----------+-------+ | 246 | +----------+---------------------------------------------+----------+-------+ |
247 | | | ^ | | | | 247 | | | ↑ | | | |
248 | | | |vsync_len | | | | 248 | | | |vsync_len | | | |
249 | | | ¥ | | | | 249 | | | ↓ | | | |
250 | +----------+---------------------------------------------+----------+-------+ | 250 | +----------+---------------------------------------------+----------+-------+ |
251 | 251 | ||
252 | The frame buffer device expects all horizontal timings in number of dotclocks | 252 | The frame buffer device expects all horizontal timings in number of dotclocks |