tree 838029b09d5dac48768b54001fe74e476cddd344
parent cf8a471909dd6a0df3efe2586cab5323184b4a7d
parent 145c0e914d2cd0cf829b8c4cbe24736b3ee81a91
author Takashi Iwai <tiwai@suse.de> 1434451654 +0200
committer Takashi Iwai <tiwai@suse.de> 1434451701 +0200

Merge branch 'for-linus' into for-next

Yet another non-trivial conflicts for HDA legacy stuff.

Signed-off-by: Takashi Iwai <tiwai@suse.de>