From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 19 Nov 2013 23:50:03 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: firefly_0821_release~176^2~4921
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4457e6f6c9f6052cd5f44a79037108b5ddeb0ce7;p=firefly-linux-kernel-4.4.55.git

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

Pull sparc fixes from David Miller:
 "Two merge window fallout build fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: merge fix
  sparc64: fix build regession
---

4457e6f6c9f6052cd5f44a79037108b5ddeb0ce7