| commit | 6236af82d8a989e150a02800c210eb61cb1e17be | |
| author | Ingo Molnar <mingo@elte.hu> | |
| Tue, 8 Jul 2008 10:24:29 +0000 (8 12:24 +0200) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Tue, 8 Jul 2008 10:24:29 +0000 (8 12:24 +0200) | ||
| tree | d5e83e66b09fc405ac70925f9b83152abaf48a03 | treesnapshot (tar.gz zip) |
| parent | e3ae0acf59244ecf5b023ec99cef4b6b29d649bc | commitdiff |
| parent | 8b7ef4ec5b1ac8b6feebf5ae9cda85a7514728f8 | commitdiff |
Merge branch 'x86/fixmap' into x86/devel
Conflicts:
arch/x86/mm/init_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Conflicts:
arch/x86/mm/init_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>