From: Arnd Bergmann Date: Thu, 23 Aug 2012 15:06:15 +0000 (+0200) Subject: Merge tag 'ux500-fixes-v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: firefly_0821_release~3680^2~2149^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5f870baa18656be6dae856f96e3b2426ae83d69b;p=firefly-linux-kernel-4.4.55.git Merge tag 'ux500-fixes-v3.6-rc2' of git://git./linux/kernel/git/linusw/linux-stericsson into fixes From Linus Walleij : Here are two audio fixes for the ux500 found by Lee Jones. * tag 'ux500-fixes-v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500' Signed-off-by: Arnd Bergmann --- 5f870baa18656be6dae856f96e3b2426ae83d69b