diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-10 10:51:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-10 10:51:55 -0700 |
| commit | bbecce8d764807701f2ff56b440cd5f787b0c844 (patch) | |
| tree | 7696b17db15a18fcd74ee4e710fe67f1ce2115a5 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
| parent | Merge branch 'stable/for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb (diff) | |
| parent | MIPS: Define ioremap_uc (diff) | |
| download | linux-dev-bbecce8d764807701f2ff56b440cd5f787b0c844.tar.xz linux-dev-bbecce8d764807701f2ff56b440cd5f787b0c844.zip | |
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."
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
0 files changed, 0 insertions, 0 deletions