diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-10-07 15:34:15 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-10-07 16:05:04 +0200 |
| commit | 2844659842017c981f6e6f74aca3a7ebe10edebb (patch) | |
| tree | 0913d12fbf8ac2a58e8d29bec40a539e213c6d07 /lib | |
| parent | drm/i915: shrinker_control->nr_to_scan is now unsigned long (diff) | |
| parent | drm/i915: Add missing const to audio_rate_need_prog() (diff) | |
| download | linux-2844659842017c981f6e6f74aca3a7ebe10edebb.tar.xz linux-2844659842017c981f6e6f74aca3a7ebe10edebb.zip | |
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>
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions