Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Nov 2016 21:53:19 +0000 (13:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Nov 2016 21:53:19 +0000 (13:53 -0800)
Pull sparc fixes from David Miller:
 "Two ugly build warning fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  dbri: Fix compiler warning
  qlogicpti: Fix compiler warnings


Trivial merge