]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit07bbc16a8676b06950a21f35b59f69b2fe763bbd
treef87fbfea747e9d92591c8d0a54db7c487e3c3d78tree | snapshot
parent6a9e91846bf52cc70a0417de19fdfac224c435c4commit | diff
parentf8e256c687eb53850685747757c8d75e58756e15commit | diff
Merge branch 'timers/urgent' into x86/xen

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>
arch/x86/kernel/cpu/common.c diff1 | diff2 | blob | history
arch/x86/kernel/smpboot.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.