Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 10 Dec 2018 10:26:53 +0000 (11:26 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 10 Dec 2018 10:26:53 +0000 (11:26 +0100)
commit46079bacb469c2eff15802fcccc88b0bd56b1e6e
tree52f3cc4768b5e63f3efc1979a50c1abee505c6dc
parente854747d7593c03c03ee785a04dce9b301ae3a9a
parent0bea4cc8383519f78f3f74caca7bdebdfb346d3b
Merge branch 'for-linus' into for-next

Back-merge for resolving the conflict of fixup entries added in both
branches.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_realtek.c