diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /drivers/char/drm/r300_reg.h | |
parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
Diffstat (limited to 'drivers/char/drm/r300_reg.h')
-rw-r--r-- | drivers/char/drm/r300_reg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/r300_reg.h b/drivers/char/drm/r300_reg.h index 3ae57ecc7afd..fa194a46c1e4 100644 --- a/drivers/char/drm/r300_reg.h +++ b/drivers/char/drm/r300_reg.h | |||
@@ -584,7 +584,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
584 | #define R300_RE_FOG_START 0x4298 | 584 | #define R300_RE_FOG_START 0x4298 |
585 | 585 | ||
586 | /* Not sure why there are duplicate of factor and constant values. | 586 | /* Not sure why there are duplicate of factor and constant values. |
587 | * My best guess so far is that there are seperate zbiases for test and write. | 587 | * My best guess so far is that there are separate zbiases for test and write. |
588 | * Ordering might be wrong. | 588 | * Ordering might be wrong. |
589 | * Some of the tests indicate that fgl has a fallback implementation of zbias | 589 | * Some of the tests indicate that fgl has a fallback implementation of zbias |
590 | * via pixel shaders. | 590 | * via pixel shaders. |