| commit | bbecce8d764807701f2ff56b440cd5f787b0c844 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Oct 10 10:51:55 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Oct 10 10:51:55 2015 -0700 |
| tree | 7696b17db15a18fcd74ee4e710fe67f1ce2115a5 | |
| parent | 1d8a12d1de9d9d025d66c1b2a580a293cc5050e5 [diff] | |
| parent | da11f98fd018319f65af9c10174ccc829207d937 [diff] |
Merge git://git.linux-mips.org/pub/scm/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."