From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 10 Mar 2009 19:51:07 +0000 (+0000)
Subject: ASoC: Fix up merge with the ARM tree
X-Git-Tag: v2.6.30-rc1~8^2~39
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f455dfb106916d855d59686fe16575c2ceb2cb2a;p=pandora-kernel.git

ASoC: Fix up merge with the ARM tree

The same change has been made with the final lines in slightly differnet
orders.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

Reading git-diff-tree failed