From: Dave Airlie <airlied@redhat.com>
Date: Tue, 10 Apr 2018 22:35:18 +0000 (+1000)
Subject: Merge tag 'drm-misc-next-fixes-2018-04-04' of git://anongit.freedesktop.org/drm/drm... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c975f17d700445051ad0f87c6822bd15816c587f;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'drm-misc-next-fixes-2018-04-04' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

hda_intel: Don't declare azx PM ops if VGA_SWITCHEROO configured (Lukas)

Cc: Lukas Wunner <lukas@wunner.de>
Cc: Takashi Iwai <tiwai@suse.de>

* tag 'drm-misc-next-fixes-2018-04-04' of git://anongit.freedesktop.org/drm/drm-misc:
  ALSA: hda - Silence PM ops build warning
---

c975f17d700445051ad0f87c6822bd15816c587f