diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-17 12:07:00 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-17 12:07:00 +0100 |
| commit | 494df596f9c315e20523894caa2a2938db3e5d8d (patch) | |
| tree | d07d7ad3e17f8c9eca91d015f32e2c915b94648d /arch/x86/include/asm/page_64.h.rej | |
| parent | 970ec1a8213cd1a1ea29972ebbe4575a8b30bca1 (diff) | |
| parent | 98c061b6cf2e7a1010286a7a4f672c4623e1b3e0 (diff) | |
| parent | f6db44df5bd39ed33883786d35342759af796e4a (diff) | |
| parent | 22796b15725488002437ebbf98a22fdbe596cf89 (diff) | |
| parent | 694aa960608d2976666d850bd4ef78053bbd0c84 (diff) | |
| parent | be716615fe596ee117292dc615e95f707fb67fd1 (diff) | |
| parent | c99608637eac8834d830496c462c054137772122 (diff) | |
| download | linux-494df596f9c315e20523894caa2a2938db3e5d8d.tar.bz2 | |
Merge branches 'x86/acpi', 'x86/apic', 'x86/cpudetect', 'x86/headers', 'x86/paravirt', 'x86/urgent' and 'x86/xen'; commit 'v2.6.29-rc5' into x86/core