From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 23 Jan 2009 11:23:32 +0000 (+0000)
Subject: ASoC: Fix merge with PXA tree
X-Git-Tag: v2.6.30-rc1~8^2~146
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c91cf25ebfbf3a5b336cbaa46646d37dd3d33127;p=pandora-kernel.git

ASoC: Fix merge with PXA tree

Fix a merge issue caused by context overlap.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

Reading git-diff-tree failed