From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 10 Oct 2015 17:51:55 +0000 (-0700)
Subject: Merge git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bbecce8d764807701f2ff56b440cd5f787b0c844;p=deliverable%2Flinux.git

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

Pull MIPS fixes from Ralf Baechle:

 - MIPS didn't define the new ioremap_uc.  Defined it as an alias for
   ioremap_uncached.

 - Replace workaround for MIPS16 build issue with a correct one.

* git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Define ioremap_uc
  MIPS: UAPI: Ignore __arch_swab{16,32,64} when using MIPS16
  Revert "MIPS: UAPI: Fix unrecognized opcode WSBH/DSBH/DSHD when using MIPS16."
---

bbecce8d764807701f2ff56b440cd5f787b0c844