tree 9642628d96e56874783f6cd763bfdf36241ce733
parent 3c71d03a28ce653708a9a6dadc5536bf49cbc5fc
parent f0af97070acbad5d6a361f485828223a4faaa0ee
author Linus Torvalds <torvalds@linux-foundation.org> 1366848618 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1366848618 -0700

Merge git://git.kernel.org/pub/scm/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.