tree a2b1e6a0b9cbd391e8b9ca020e42b76652c52c2c
parent ff637d38ea6b9c54f708a2b9edabc1b0c73c6d0a
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1232709812 +0000
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1232709812 +0000

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>