From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Nov 2016 21:53:19 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v6.1~15369
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96e52d3ac88780d60ca74bb96301369b7e0c5867;p=sdk%2Femulator%2Femulator-kernel.git

Merge git://git./linux/kernel/git/davem/sparc

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

96e52d3ac88780d60ca74bb96301369b7e0c5867