From: Mark Brown Date: Mon, 18 Apr 2011 17:07:43 +0000 (+0100) Subject: ASoC: Merge branch 'for-2.6.39' into for-2.6.40 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d5381e42f64ca19f05c5799ffae5708acb6ed411;p=linux.git ASoC: Merge branch 'for-2.6.39' into for-2.6.40 Fix trivial conflict caused by silly spelling fix patch. Conflicts: sound/soc/codecs/wm8994.c --- d5381e42f64ca19f05c5799ffae5708acb6ed411