tree 33e64fc453619978c3ecc86c7ec3649db3b4d8dc
parent db0c2bf69aa095d4a6de7b1145f29fe9a7c0f6a3
parent 933393f58fef9963eac61db8093689544e29a600
author Linus Torvalds <torvalds@linux-foundation.org> 1326143308 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326143308 -0800

Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/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.