Merge commit 'v2.6.26' into x86/core
[pandora-kernel.git] / drivers / gpu / drm / i915 / i915_mem.c