Merge branch 'this_cpu_ops' into for-2.6.38

author Tejun Heo <tj@kernel.org>

Fri, 17 Dec 2010 14:16:46 +0000 (15:16 +0100)

committer Tejun Heo <tj@kernel.org>

Fri, 17 Dec 2010 14:16:46 +0000 (15:16 +0100)
author Tejun Heo <tj@kernel.org>
Fri, 17 Dec 2010 14:16:46 +0000 (15:16 +0100)
committer Tejun Heo <tj@kernel.org>
Fri, 17 Dec 2010 14:16:46 +0000 (15:16 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/x86/xen/time.c
Simple merge
diff --cc kernel/printk.c
Simple merge
author	Tejun Heo <tj@kernel.org>
	Fri, 17 Dec 2010 14:16:46 +0000 (15:16 +0100)
committer	Tejun Heo <tj@kernel.org>
	Fri, 17 Dec 2010 14:16:46 +0000 (15:16 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/time.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	patch \|	diff1 \|	diff2 \|	blob \| history