]> 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)
commit21e9dbc74d3903144e4f34dcaef37ccc2e89e7d8
treebc03d0cd7ca07f4b345c4d54d1293bed03ebc1c4
parentb3cc1d38b751973d82ef5e8a29154e15cec4b0cd
parent9a69020d8e9dbecda3b0f02329cf3e41040ec0a0
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