]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 62753fe 2755e03)
Merge remote-tracking branch 'takashi/topic/drm-sync-audio-rate' into drm-intel-next...
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 7 Oct 2015 13:34:15 +0000 (15:34 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 7 Oct 2015 14:05:04 +0000 (16:05 +0200)
commit94e69c2df39a56ed5eda80a14ad0c8286cec5d0e
tree0913d12fbf8ac2a58e8d29bec40a539e213c6d07tree | snapshot
parent62753fefa7413e0773bbff516ecf1777cf9d3b10commit | diff
parent2755e036b78c812fbe859fb3c167c19671bb4c66commit | diff
Merge remote-tracking branch 'takashi/topic/drm-sync-audio-rate' into drm-intel-next-queued

Pull in the i915/hda changes for N/CTS setting so I can apply the
follow-up documentation work for drm/i915.

Some conflicts because ofc we had to rework i915 while that N/CTS work
was going on. But not more than adjacent changes really.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/i915/i915_dma.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_drv.h diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_audio.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.