diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 09:47:32 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 09:47:32 +0100 |
commit | 7032e8696726354d6180d8a2d17191f958cd93ae (patch) | |
tree | 5af02052e633bcde0e33f77cac52ab4685ad07f1 /arch/x86/mm/pat.c | |
parent | Merge branch 'x86/mm' into x86/core (diff) | |
parent | x86 setup: a20: early timeout for a nonexistent keyboard controller (diff) | |
parent | x86, hpet: fix for LS21 + HPET = boot hang (diff) | |
download | linux-7032e8696726354d6180d8a2d17191f958cd93ae.tar.xz linux-7032e8696726354d6180d8a2d17191f958cd93ae.zip |
Merge branches 'x86/paravirt', 'x86/pat', 'x86/setup-v2', 'x86/subarch', 'x86/uaccess' and 'x86/urgent' into x86/core