diff options
author | Ingo Molnar <mingo@elte.hu> | 2012-01-31 12:02:35 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-01-31 12:02:37 (GMT) |
commit | bb1693f89ae7f0b30c90d9b26a4f827faed1144a (patch) | |
tree | e02fc59d76d79493bffa190e492775baa134bff6 /drivers/gpu/drm/i915/intel_sprite.c | |
parent | efb3040d481a1594592b1defb4526c406c7a4751 (diff) | |
parent | 45179fec946dd554f74e950d2278dabd5ad23fd3 (diff) | |
download | linux-fsl-qoriq-bb1693f89ae7f0b30c90d9b26a4f827faed1144a.tar.xz |
Merge branch 'perf/urgent' into perf/core
We cherry-picked 3 commits into perf/urgent, merge them back to allow
conflict-free work on those files.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sprite.c')
0 files changed, 0 insertions, 0 deletions