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)
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


Trivial merge