diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:24:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:24:29 +0200 |
| commit | 6236af82d8a989e150a02800c210eb61cb1e17be (patch) | |
| tree | d5e83e66b09fc405ac70925f9b83152abaf48a03 /include/asm-x86/setup.h | |
| parent | e3ae0acf59244ecf5b023ec99cef4b6b29d649bc (diff) | |
| parent | 8b7ef4ec5b1ac8b6feebf5ae9cda85a7514728f8 (diff) | |
Merge branch 'x86/fixmap' into x86/devel
Conflicts:
arch/x86/mm/init_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/setup.h')
0 files changed, 0 insertions, 0 deletions