git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ff637d3)
ASoC: Fix merge with PXA tree
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 23 Jan 2009 11:23:32 +0000 (11:23 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 23 Jan 2009 11:23:32 +0000 (11:23 +0000)
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>

No differences found
Pandora Kernel Repository