Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Apr 2013 00:10:18 +0000 (17:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Apr 2013 00:10:18 +0000 (17:10 -0700)
Pull sparc fix from David Miller:
 "Brown paper bag fix for sparc64"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Fix missing put_cpu_var() in tlb_batch_add_one() when not batching.


Trivial merge