diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 15:48:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 15:48:50 -0500 |
| commit | a1413c89ae6a4b7a9a43f7768934a81ffb5c629a (patch) | |
| tree | 7e16be26407c5fd4dfbfeb98b11590809a963664 /init/Makefile | |
| parent | f254f3909efaf59ca2d0f408de2d044dace60706 (diff) | |
| parent | dd4124a8a06bca89c077a16437edac010f0bb993 (diff) | |
Merge branch 'x86/urgent' into x86/core
Conflicts:
arch/x86/include/asm/fixmap_64.h
Semantic merge:
arch/x86/include/asm/fixmap.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'init/Makefile')
0 files changed, 0 insertions, 0 deletions