Dave Airlie 9c725e5bcd Merge branch 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-next ... Alex writes: This is the radeon drm-next request. Big changes include: - support for dpm on CIK parts - support for ASPM on CIK parts - support for berlin GPUs - major ring handling cleanup - remove the old 3D blit code for bo moves in favor of CP DMA or sDMA - lots of bug fixes [airlied: fix up a bunch of conflicts from drm_order removal] * 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux: (898 commits) drm/radeon/dpm: make sure dc performance level limits are valid (CI) drm/radeon/dpm: make sure dc performance level limits are valid (BTC-SI) (v2) drm/radeon: gcc fixes for extended dpm tables drm/radeon: gcc fixes for kb/kv dpm drm/radeon: gcc fixes for ci dpm drm/radeon: gcc fixes for si dpm drm/radeon: gcc fixes for ni dpm drm/radeon: gcc fixes for trinity dpm drm/radeon: gcc fixes for sumo dpm drm/radeonn: gcc fixes for rv7xx/eg/btc dpm drm/radeon: gcc fixes for rv6xx dpm drm/radeon: gcc fixes for radeon_atombios.c drm/radeon: enable UVD interrupts on CIK drm/radeon: fix init ordering for r600+ drm/radeon/dpm: only need to reprogram uvd if uvd pg is enabled drm/radeon: check the return value of uvd_v1_0_start in uvd_v1_0_init drm/radeon: split out radeon_uvd_resume from uvd_v4_2_resume radeon kms: fix uninitialised hotplug work usage in r100_irq_process() drm/radeon/audio: set up the sads on DCE3.2 asics drm/radeon: fix handling of variable sized arrays for router objects ... Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/i915_gem_dmabuf.c drivers/gpu/drm/i915/intel_pm.c drivers/gpu/drm/radeon/cik.c drivers/gpu/drm/radeon/ni.c drivers/gpu/drm/radeon/r600.c		2013-09-02 09:31:40 +10:00
..
aoa	ALSA: snd-aoa: Add a layout entry for PowerBook6,5	2013-05-16 07:19:01 +02:00
arm	ALSA: pxa2xx: Fix unlocked snd_pcm_stop() call	2013-07-15 21:25:13 +02:00
atmel	ALSA: atmel: Remove redundant platform_set_drvdata()	2013-05-03 11:40:23 +02:00
core	ALSA: compress: fix the return value for SNDRV_COMPRESS_VERSION	2013-07-29 13:58:08 +02:00
drivers	ALSA: vx_core: off by one in vx_read_status()	2013-06-21 14:32:06 +02:00
firewire	IEEE 1394 (FireWire) subsystem changes post v3.10:	2013-07-10 11:02:58 -07:00
i2c	ALSA: ak4xx-adda: info leak in ak4xxx_capture_source_info()	2013-06-26 10:35:55 +02:00
isa	ALSA: ISA: Remove superfluous *_set_drvdata(NULL) calls	2013-05-29 12:50:28 +02:00
mips	ALSA: mips/sgio2audio: Remove redundant platform_set_drvdata()	2013-05-06 10:45:54 +02:00
oss	sound: oss/vwsnd: Always define vwsnd_mutex	2013-07-15 12:07:58 +02:00
parisc	ALSA: Remove the rest of *_set_drvdata(NULL) calls	2013-05-29 12:50:59 +02:00
pci	Merge branch 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-next	2013-09-02 09:31:40 +10:00
pcmcia	sound/pcmcia: use module_pcmcia_driver() in pcmcia drivers	2013-03-15 12:26:39 -07:00
ppc	ALSA: powermac: Remove redundant platform_set_drvdata()	2013-05-23 14:35:58 +02:00
sh	ALSA: sh_dac_audio: Remove redundant platform_set_drvdata()	2013-05-23 14:36:45 +02:00
soc	Merge remote-tracking branch 'asoc/fix/tegra' into asoc-linus	2013-08-15 11:37:54 +01:00
sparc	ALSA: Remove the rest of *_set_drvdata(NULL) calls	2013-05-29 12:50:59 +02:00
spi	ALSA: Remove the rest of *_set_drvdata(NULL) calls	2013-05-29 12:50:59 +02:00
synth
usb	ALSA: usb-audio: Fix invalid volume resolution for Logitech HD Webcam C525	2013-08-12 14:55:20 +02:00
ac97_bus.c
Kconfig	sound: remove reference to feature-removal-schedule.txt	2012-12-17 17:15:12 -08:00
last.c	ALSA: Remove the last mention of SNDRV_MAIN_OBJECT_FILE	2012-09-03 10:07:23 +02:00
Makefile
sound_core.c	drivers: avoid format string in dev_set_name	2013-07-03 16:07:41 -07:00
sound_firmware.c	sound_firmware: don't bother with filp_close()	2013-04-09 15:16:32 -04:00