| commit | 22796b15725488002437ebbf98a22fdbe596cf89 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Feb 13 21:05:03 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Feb 13 21:05:03 2009 +0100 |
| tree | e6745c9e367e782c0b184eb941e2b86805975f88 | |
| parent | bf33a70a73876b163d62612e9567cbac6604ba7e [diff] | |
| parent | 0fb807c3e573ff9de2965ca38c907605d4735d16 [diff] |
Merge branch 'core/header-fixes' into x86/headers Conflicts: arch/x86/include/asm/setup.h