Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Apr 2017 20:56:51 +0000 (13:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Apr 2017 20:56:51 +0000 (13:56 -0700)
commit005882e53d62f25dae10351a8d3f13326051e8f5
tree4c482d5b830877cbce99d4d9bca4802946e7471a
parent40d9018eb738f724dc9c27eec88c78cc488e0af0
parent544f8f935863c5a9ca3e34306ea3316095e7b7bf
Merge git://git./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