]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 11 Dec 2011 03:24:44 +0000 (11:24 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 11 Dec 2011 03:24:44 +0000 (11:24 +0800)
commit9a8a1f79bfa0f54ef5b9d758fe82874d77418b9f
treebc03d0cd7ca07f4b345c4d54d1293bed03ebc1c4
parent4bc54e099e72dff0bc2acbfc743124e86d14b657
parentcaeb616710fabcb0fe44f88e61fedea7867a3ac4
Merge branch 'for-3.2' into for-3.3

Conflicts:
sound/soc/mxs/mxs-pcm.c
sound/soc/mxs/mxs-pcm.c
sound/soc/mxs/mxs-sgtl5000.c