git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a9e918 f8e256c)
Merge branch 'timers/urgent' into x86/xen
authorIngo Molnar <mingo@elte.hu>
Tue, 23 Sep 2008 21:26:42 +0000 (23:26 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 23 Sep 2008 21:26:42 +0000 (23:26 +0200)
Conflicts:
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c

Manual merge:

arch/x86/kernel/smpboot.c

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

Trivial merge
Pandora Kernel Repository