diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-30 02:38:08 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-30 02:38:08 +0100 |
| commit | c5bc1c9305e87d84c20415cc5ed2d3944d5bad8d (patch) | |
| tree | 91b35672d7419548d0c532e72eb09a1f2c82b9f4 /arch/arm/mach-pxa/magician.c | |
| parent | Merge tag 'rtc-4.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abello... (diff) | |
| parent | Merge branch 'linux-4.4' of git://anongit.freedesktop.org/git/nouveau/linux-2... (diff) | |
| download | linux-c5bc1c9305e87d84c20415cc5ed2d3944d5bad8d.tar.xz linux-c5bc1c9305e87d84c20415cc5ed2d3944d5bad8d.zip | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull nouveau and radeon fixes from Dave Airlie:
"Just some nouveau and radeon/amdgpu fixes.
The nouveau fixes look large as the firmware context files are
regenerated, but the actual change is quite small"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/radeon: make some dpm errors debug only
drm/nouveau/volt/pwm/gk104: fix an off-by-one resulting in the voltage not being set
drm/nouveau/nvif: allow userspace access to its own client object
drm/nouveau/gr/gf100-: fix oops when calling zbc methods
drm/nouveau/gr/gf117-: assume no PPC if NV_PGRAPH_GPC_GPM_PD_PES_TPC_ID_MASK is zero
drm/nouveau/gr/gf117-: read NV_PGRAPH_GPC_GPM_PD_PES_TPC_ID_MASK from correct GPC
drm/nouveau/gr/gf100-: split out per-gpc address calculation macro
drm/nouveau/bios: return actual size of the buffer retrieved via _ROM
drm/nouveau/instmem: protect instobj list with a spinlock
drm/nouveau/pci: enable c800 magic for some unknown Samsung laptop
drm/nouveau/pci: enable c800 magic for Clevo P157SM
drm/radeon: make rv770_set_sw_state failures non-fatal
drm/amdgpu: move dependency handling out of atomic section v2
drm/amdgpu: optimize scheduler fence handling
drm/amdgpu: remove vm->mutex
drm/amdgpu: add mutex for ba_va->valids/invalids
drm/amdgpu: adapt vce session create interface changes
drm/amdgpu: vce use multiple cache surface starting from stoney
drm/amdgpu: reset vce trap interrupt flag
Diffstat (limited to 'arch/arm/mach-pxa/magician.c')
0 files changed, 0 insertions, 0 deletions