diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 20:37:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 20:37:06 -0700 |
| commit | b83db1deb29eb4eea9bf5992431d26978e039ce6 (patch) | |
| tree | a59a4d94c41de6889be93b6963c791aa64181f25 /fs/timerfd.c | |
| parent | 7d2f280e75f05919314e250cadf361a327ed555c (diff) | |
| parent | 7e94250312d8b32a18e7e96cee19f2795d224e8c (diff) | |
Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/kms: enable unmappable vram for evergreen
drm/radeon/kms: fix tiled db height calculation on 6xx/7xx
drm/radeon/kms: fix handling of tex lookup disable in cs checker on r2xx
Diffstat (limited to 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions