tree 4c482d5b830877cbce99d4d9bca4802946e7471a
parent 40d9018eb738f724dc9c27eec88c78cc488e0af0
parent 544f8f935863c5a9ca3e34306ea3316095e7b7bf
author Linus Torvalds <torvalds@linux-foundation.org> 1492549011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1492549011 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:
 "Two Sparc bug fixes from Daniel Jordan and Nitin Gupta"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Fix hugepage page table free
  sparc64: Use LOCKDEP_SMALL, not PROVE_LOCKING_SMALL