Merge branches 'x86-fixes-for-linus', 'sched-fixes-for-linus', 'timers-fixes-for...

[pandora-kernel.git] / drivers / gpu / drm / radeon / radeon_display.c

diff --cc drivers/gpu/drm/radeon/radeon_display.c
Simple merge