| commit | 6d2e91bf80e4410207f01edb0962aec9213f3533 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Mar 04 20:20:10 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Mar 04 20:20:10 2009 +0100 |
| tree | d9e63711b0958748accff409596eca742a3c360b | |
| parent | 6298e719cf388f43b674f43799af467d3e4e5aa7 [diff] | |
| parent | dd39ecf522ba86c70809715af46e6557f6491131 [diff] |
Merge branch 'x86/urgent' into x86/mm Conflicts: arch/x86/include/asm/fixmap_64.h Semantic merge: arch/x86/include/asm/fixmap.h Signed-off-by: Ingo Molnar <mingo@elte.hu>