projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1d8a12d da11f98)
Merge git://git.linux-mips.org/pub/scm/ralf/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Oct 2015 17:51:55 +0000 (10:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Oct 2015 17:51:55 +0000 (10:51 -0700)
commitbbecce8d764807701f2ff56b440cd5f787b0c844
tree7696b17db15a18fcd74ee4e710fe67f1ce2115a5tree | snapshot
parent1d8a12d1de9d9d025d66c1b2a580a293cc5050e5commit | diff
parentda11f98fd018319f65af9c10174ccc829207d937commit | diff
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."
John Crispins staging tree