projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1d8a12d
da11f98
)
Merge git://git.linux-mips.org/pub/scm/ralf/upstream-linus
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 10 Oct 2015 17:51:55 +0000
(10:51 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 10 Oct 2015 17:51:55 +0000
(10:51 -0700)
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."
Trivial merge