From: Takashi Iwai Date: Wed, 17 Feb 2010 13:24:46 +0000 (+0100) Subject: Merge branch 'fix/misc' into topic/misc X-Git-Tag: firefly_0821_release~9833^2~2092^2~2^2~44 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7fb3a069bc5d3577409c2ae89f89cd264ff85816;p=firefly-linux-kernel-4.4.55.git Merge branch 'fix/misc' into topic/misc Conflicts: sound/pci/hda/patch_realtek.c --- 7fb3a069bc5d3577409c2ae89f89cd264ff85816