diff options
| author | Linus Torvalds | 2006-10-04 01:35:11 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-10-04 01:35:11 +0200 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /Documentation/fb/sisfb.txt | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
| parent | Add missing maintainer countries in CREDITS (diff) | |
| download | kernel-qcow2-linux-708e16892e1646594a29eaa7ac7b209b600b9fd2.tar.gz kernel-qcow2-linux-708e16892e1646594a29eaa7ac7b209b600b9fd2.tar.xz kernel-qcow2-linux-708e16892e1646594a29eaa7ac7b209b600b9fd2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'Documentation/fb/sisfb.txt')
| -rw-r--r-- | Documentation/fb/sisfb.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/fb/sisfb.txt b/Documentation/fb/sisfb.txt index 3b50c517a08d..2e68e503e72f 100644 --- a/Documentation/fb/sisfb.txt +++ b/Documentation/fb/sisfb.txt @@ -72,7 +72,7 @@ information. Additionally, "modinfo sisfb" gives an overview over all supported options including some explanation. The desired display mode can be specified using the keyword "mode" with -a parameter in one of the follwing formats: +a parameter in one of the following formats: - XxYxDepth or - XxY-Depth or - XxY-Depth@Rate or |