diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-10-20 00:26:44 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-10-20 00:26:44 -0400 |
| commit | 748c5151deb56e4b7b5a9b07a884243764933831 (patch) | |
| tree | e9dd45b8806d00b56503cfa55c46f3ebce0d151c /drivers/char/drm/drm_sman.h | |
| parent | 4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff) | |
| parent | e8b8c977734193adedf2b0f607d6252c78e86394 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/drm/drm_sman.h')
| -rw-r--r-- | drivers/char/drm/drm_sman.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_sman.h b/drivers/char/drm/drm_sman.h index 39a39fefeef1..08ecf83ad5d4 100644 --- a/drivers/char/drm/drm_sman.h +++ b/drivers/char/drm/drm_sman.h | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | * struct or a context identifier. | 33 | * struct or a context identifier. |
| 34 | * | 34 | * |
| 35 | * Authors: | 35 | * Authors: |
| 36 | * Thomas Hellstr๖m <thomas-at-tungstengraphics-dot-com> | 36 | * Thomas Hellstrรถm <thomas-at-tungstengraphics-dot-com> |
| 37 | */ | 37 | */ |
| 38 | 38 | ||
| 39 | #ifndef DRM_SMAN_H | 39 | #ifndef DRM_SMAN_H |