Merge commit 'v2.6.26' into x86/core
[pandora-kernel.git] / include / drm / i915_drm.h