]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ff637d3) | patch
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)
commitc91cf25ebfbf3a5b336cbaa46646d37dd3d33127
treea2b1e6a0b9cbd391e8b9ca020e42b76652c52c2ctree | snapshot
parentff637d38ea6b9c54f708a2b9edabc1b0c73c6d0acommit | diff
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>
sound/soc/pxa/e800_wm9712.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.