diff options
| author | Linus Torvalds | 2013-06-08 20:35:20 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2013-06-08 20:35:20 +0200 |
| commit | 6ea31c56a54ef79b46b56ad35a308db474d600d3 (patch) | |
| tree | 1638f054f31493806b3c0ab25c4a412851d2d630 /arch/m68k/include/asm/adb_iop.h | |
| parent | Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma (diff) | |
| parent | Merge branch 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/no... (diff) | |
| download | kernel-qcow2-linux-6ea31c56a54ef79b46b56ad35a308db474d600d3.tar.gz kernel-qcow2-linux-6ea31c56a54ef79b46b56ad35a308db474d600d3.tar.xz kernel-qcow2-linux-6ea31c56a54ef79b46b56ad35a308db474d600d3.zip | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Regression fixers for the big 3:
- nouveau: hdmi audio, dac load detect, s/r regressions fixed
- radeon: long standing system hang fixed, hdmi audio and rs780 fast
fb fixes
- intel: one old regression, a WARN removal, and a stop X dying fix
Otherwise one mgag200 fix, a couple of arm build fixes, and a core use
after free fix."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/nv50/kms: use dac loadval from vbios, where it's available
drm/nv50/disp: force dac power state during load detect
drm/nv50-nv84/fifo: fix resume regression introduced by playlist race fix
drm/nv84/disp: Fix HDMI audio regression
drm/i915/sdvo: Use &intel_sdvo->ddc instead of intel_sdvo->i2c for DDC.
drm/radeon: don't allow audio on DCE6
drm/radeon: Use direct mapping for fast fb access on RS780/RS880 (v2)
radeon: Fix system hang issue when using KMS with older cards
drm/i915: no lvds quirk for hp t5740
drm/i915: Quirk the pipe A quirk in the modeset state checker
drm/i915: Fix spurious -EIO/SIGBUS on wedged gpus
drm/mgag200: Add missing write to index before accessing data register
drm/nouveau: use mdelay instead of large udelay constants
drm/tilcd: select BACKLIGHT_LCD_SUPPORT
drm: fix a use-after-free when GPU acceleration disabled
Diffstat (limited to 'arch/m68k/include/asm/adb_iop.h')
0 files changed, 0 insertions, 0 deletions