]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitcaf4d49e272ee5bfd3d98f3e23b420d89ae107ed
tree56ba38b871fe6851b4d98da62e18b70d5f081feb
parent1219f584e646317dd528c6cf09ae929449be5d72
parentf1f4787d3ceec815befec890bbed229b212f6260
Merge branch 'for-3.1' into for-3.2

Conflicts:
sound/soc/omap/mcpdm.c
sound/soc/omap/mcpdm.h