Merge tag 'drm-misc-next-fixes-2018-04-04' of git://anongit.freedesktop.org/drm/drm...
authorDave Airlie <airlied@redhat.com>
Tue, 10 Apr 2018 22:35:18 +0000 (08:35 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 10 Apr 2018 22:35:18 +0000 (08:35 +1000)
commitc975f17d700445051ad0f87c6822bd15816c587f
tree7fd7679451aba8bdc9d999e7dca43342f5252f0d
parent694f54f680f7fd8e9561928fbfc537d9afbc3d79
parent8cd1b5bd70cccda6854088825e725a513ec919c6
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
sound/pci/hda/hda_intel.c