git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a421296 b05f5c1)
Merge branch 'mxc-audio' into for-2.6.34
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 17 Jan 2010 16:47:32 +0000 (16:47 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 17 Jan 2010 16:47:32 +0000 (16:47 +0000)
Conflicts:
arch/arm/plat-mxc/Makefile (dual add)
sound/soc/imx/mx27vis_wm8974.c (API updates & removal)


Trivial merge
Pandora Kernel Repository