diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-10 13:49:08 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-10 13:49:08 +0100 |
| commit | 4331f6c95fadc37ea89359d6afb915be838790f9 (patch) | |
| tree | 2a130641c946e34c73700ef7fe013e8f6d50b7cd /include/drm/i915_drm.h | |
| parent | 7210ee5b3abe280f6ef06b26381c93a7f2570837 (diff) | |
| parent | a6efcec534efc811a469a9e87ca5ec5cf26d11e1 (diff) | |
Merge branch 'om-gta02-2.6.31' into om-2.6.31
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
Diffstat (limited to 'include/drm/i915_drm.h')
0 files changed, 0 insertions, 0 deletions