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)
commit0fbd06761f5c17cc9b20e02af60fd7ee9c895996
tree9642628d96e56874783f6cd763bfdf36241ce733
parent3c71d03a28ce653708a9a6dadc5536bf49cbc5fc
parentf0af97070acbad5d6a361f485828223a4faaa0ee
Merge git://git./linux/kernel/git/davem/sparc

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.