| commit | 22796b15725488002437ebbf98a22fdbe596cf89 | |
| author | Ingo Molnar <mingo@elte.hu> | |
| Fri, 13 Feb 2009 20:05:03 +0000 (13 21:05 +0100) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Fri, 13 Feb 2009 20:05:03 +0000 (13 21:05 +0100) | ||
| tree | e6745c9e367e782c0b184eb941e2b86805975f88 | treesnapshot (tar.gz zip) |
| parent | bf33a70a73876b163d62612e9567cbac6604ba7e | commitdiff |
| parent | 0fb807c3e573ff9de2965ca38c907605d4735d16 | commitdiff |
Merge branch 'core/header-fixes' into x86/headers
Conflicts:
arch/x86/include/asm/setup.h
Conflicts:
arch/x86/include/asm/setup.h
| arch/x86/include/asm/setup.h | diff1 | diff2 | blobhistory |
| arch/x86/include/asm/syscalls.h | diff1 | diff2 | blobhistory |