]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - drivers/i2c/chips/Kconfig
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3ddeb51 cf3997f)
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc...
authorIngo Molnar <mingo@elte.hu>
Tue, 27 Jan 2009 11:03:24 +0000 (12:03 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 27 Jan 2009 11:03:24 +0000 (12:03 +0100)
commit4369f1fb7cd4cf777312f43e1cb9aa5504fc4125
treea5525d63fe682e6744c109fb72f7e1b33855cb00tree | snapshot
parent3ddeb51d9c83931c1ca6abf76a38934c5a1ed918commit | diff
parentcf3997f507624757f149fcc42b76fb03c151fb65commit | diff
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu

Conflicts:
arch/x86/kernel/setup_percpu.c

Semantic conflict:

arch/x86/kernel/cpu/common.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/common.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.