git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8dc8e5e 991ec02)
Merge branch 'linus' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Thu, 11 Jun 2009 15:55:42 +0000 (17:55 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 11 Jun 2009 15:55:42 +0000 (17:55 +0200)
Conflicts:
arch/x86/kernel/irqinit.c
arch/x86/kernel/irqinit_64.c
arch/x86/kernel/traps.c
arch/x86/mm/fault.c
include/linux/sched.h
kernel/exit.c


Trivial merge
Pandora Kernel Repository