diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-11-05 13:46:06 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-11-05 13:46:06 +0100 |
| commit | 5ce43a346cb9b2a6f6f31f1f750db75d5628c15b (patch) | |
| tree | 51a60696567d1c93b682435aecbbf5ae24a376b8 /linux-core/drm_hashtab.c | |
| parent | 1b91113957e731d264d1e5d49326597f3b78e96f (diff) | |
| parent | 427cc561b3dfbd504472e284e5fc16b63acd1816 (diff) | |
Merge branch 'master' into modesetting-101
Conflicts:
linux-core/drm_bufs.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'linux-core/drm_hashtab.c')
| -rw-r--r-- | linux-core/drm_hashtab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_hashtab.c b/linux-core/drm_hashtab.c index a8ec8468..dacc83be 100644 --- a/linux-core/drm_hashtab.c +++ b/linux-core/drm_hashtab.c @@ -128,7 +128,7 @@ int drm_ht_insert_item(struct drm_open_hash * ht, struct drm_hash_item * item) } /* - * Just insert an item and return any "bits" bit key that hasn't been + * Just insert an item and return any "bits" bit key that hasn't been * used before. */ int drm_ht_just_insert_please(struct drm_open_hash * ht, struct drm_hash_item * item, |