Merge branch 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 06:17:16 +0000 (15:17 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 06:17:16 +0000 (15:17 +0900)
commitc08acff0544c5dadf892e3908799a5ca1d98e592
tree52fbb693a523ef7c6eeb33dd58c6a95f6feb1ea5
parent10d0c9705e80bbd3d587c5fad24599aabaca6688
parent90f2492cf9c84fd414ecfd2f40685fb5291a484e
Merge branch 'for-3.13' of git://git./linux/kernel/git/tj/percpu

Pull percpu changes from Tejun Heo:
 "Two smallish changes for percpu.  Two patches to remove unused
  this_cpu_xor() and one to fix a bug in percpu init failure path so
  that it can reach the proper BUG() instead of oopsing earlier"

* 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  x86: remove this_cpu_xor() implementation
  percpu: remove this_cpu_xor() implementation
  percpu: fix bootmem error handling in pcpu_page_first_chunk()
arch/x86/include/asm/percpu.h
include/linux/percpu.h