diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 12:16:59 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 12:16:59 +0100 |
| commit | eca217b36e5d7d4377493d5cedd89105e66a5a72 (patch) | |
| tree | 71f0ecd5225c3033d509b77a23ad7bc576cf0ab6 /drivers/video/cg6.c | |
| parent | 54a353a0f845c1dad5fc8183872e750d667838ac (diff) | |
| parent | e4d0407185cdbdcfd99fc23bde2e5454bbc46329 (diff) | |
| download | blackbird-op-linux-eca217b36e5d7d4377493d5cedd89105e66a5a72.tar.gz blackbird-op-linux-eca217b36e5d7d4377493d5cedd89105e66a5a72.zip | |
Merge branch 'x86/paravirt' into x86/apic
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
Diffstat (limited to 'drivers/video/cg6.c')
0 files changed, 0 insertions, 0 deletions
