]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 16 Jun 2015 10:47:34 +0000 (12:47 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 16 Jun 2015 10:48:21 +0000 (12:48 +0200)
commit0b2d71175990629f11189f5df98cc0c26ae61993
tree838029b09d5dac48768b54001fe74e476cddd344
parentcf8a471909dd6a0df3efe2586cab5323184b4a7d
parent145c0e914d2cd0cf829b8c4cbe24736b3ee81a91
Merge branch 'for-linus' into for-next

Yet another non-trivial conflicts for HDA legacy stuff.

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