| commit | f541ae326fa120fa5c57433e4d9a133df212ce41 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Apr 06 09:02:57 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Apr 06 09:02:57 2009 +0200 |
| tree | bdbd94ec72cfc601118051cb35e8617d55510177 | |
| parent | e255357764f92afcafafbd4879b222b8c752065a [diff] | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c [diff] |
Merge branch 'linus' into perfcounters/core-v2 Merge reason: we have gathered quite a few conflicts, need to merge upstream Conflicts: arch/powerpc/kernel/Makefile arch/x86/ia32/ia32entry.S arch/x86/include/asm/hardirq.h arch/x86/include/asm/unistd_32.h arch/x86/include/asm/unistd_64.h arch/x86/kernel/cpu/common.c arch/x86/kernel/irq.c arch/x86/kernel/syscall_table_32.S arch/x86/mm/iomap_32.c include/linux/sched.h kernel/Makefile Signed-off-by: Ingo Molnar <mingo@elte.hu>