diff options
| author | Thomas Gleixner <[email protected]> | 2010-10-12 14:39:44 +0000 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2010-10-12 14:39:53 +0000 |
| commit | 8ffcfa4e2d96342180e02dfe1230b97778c52d72 (patch) | |
| tree | 77255a0235022444fe958ab1092fb352e6222b72 /drivers/gpu/drm/drm_buffer.c | |
| parent | genirq: Query arch for number of early descriptors (diff) | |
| parent | x86, x2apic: Simplify apic init in SMP and UP builds (diff) | |
| download | kernel-8ffcfa4e2d96342180e02dfe1230b97778c52d72.tar.gz kernel-8ffcfa4e2d96342180e02dfe1230b97778c52d72.zip | |
Merge branch 'x86/x2apic' into irq/sparseirq
Reason: Avoid conflicts with the x2apic modifications
Signed-off-by: Thomas Gleixner <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/drm_buffer.c')
0 files changed, 0 insertions, 0 deletions