diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 17:02:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 17:02:05 -0700 |
| commit | 413f81eba35d6ede9289b0c8a920c013a84fac71 (patch) | |
| tree | 688a864f1fa822ac9b60b08add6c7e2e9d35a372 /kernel/trace/trace_power.c | |
| parent | 899ad580fe93c6d2a9f364fb0329ef2c259ccd1d (diff) | |
| parent | 42beefc0093725ec0f8cea340cc54c36ccaceea0 (diff) | |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/r128: fix r128 ioremaps to use ioremap_wc.
drm: cleanup properly in drm_get_dev() failure paths
drm: clean the map list before destroying the hash table
drm: remove unreachable code in drm_sysfs.c
drm: add control node checks missing from kms merge
drm/kms: don't try to shortcut drm mode set function
drm/radeon: bump minor version for occlusion queries support
Diffstat (limited to 'kernel/trace/trace_power.c')
0 files changed, 0 insertions, 0 deletions