From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 23 Aug 2015 14:23:09 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v4.14-rc1~4858
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb63b34bdfbdd70a734c2a90d89117c5c6c605c2;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'upstream' of git://git.linux-mips.org/ralf/upstream-linus

Pull MIPS bug fixes from Ralf Baechle:
 "Two more fixes for 4.2.

  One fixes a build issue with the LLVM assembler - LLVM assembler macro
  names are case sensitive, GNU as macro names are insensitive; the
  other corrects a license string (GPL v2, not GPLv2) such that the
  module loader will recognice the license correctly"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  FIRMWARE: bcm47xx_nvram: Fix module license.
  MIPS: Fix LLVM build issue.
---

eb63b34bdfbdd70a734c2a90d89117c5c6c605c2