git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1609743 31bbed5)
Merge branch 'x86/core' into tracing/textedit
authorIngo Molnar <mingo@elte.hu>
Fri, 6 Mar 2009 15:44:14 +0000 (16:44 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 6 Mar 2009 15:45:01 +0000 (16:45 +0100)
Conflicts:
arch/x86/Kconfig
block/blktrace.c
kernel/irq/handle.c

Semantic conflict:
kernel/trace/blktrace.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge
Pandora Kernel Repository