projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b8713f b5c49d4)
Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Oct 2011 19:20:35 +0000 (20:20 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Oct 2011 19:20:35 +0000 (20:20 +0100)
Conflicts:
sound/soc/omap/mcpdm.c
sound/soc/omap/mcpdm.h


Trivial merge
John Crispins staging tree