From: Linus Torvalds Date: Mon, 9 Jan 2012 21:08:28 +0000 (-0800) Subject: Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu X-Git-Tag: v3.3-rc1~147 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5;p=pandora-kernel.git Merge branch 'for-3.3' of git://git./linux/kernel/git/tj/percpu * 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: percpu: Remove irqsafe_cpu_xxx variants Fix up conflict in arch/x86/include/asm/percpu.h due to clash with cebef5beed3d ("x86: Fix and improve percpu_cmpxchg{8,16}b_double()") which edited the (now removed) irqsafe_cpu_cmpxchg*_double code. --- 6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5 Reading git-diff-tree failed