]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'v3.6-rc6' into for-3.7
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 22 Sep 2012 15:26:27 +0000 (11:26 -0400)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 22 Sep 2012 15:26:27 +0000 (11:26 -0400)
commit6e92e20657d0c7135e6460b06cdb1e8eda5285fa
tree7128cb13b599d2903a4deb05bbae37508b1c261e
parent2d34aa8663aa8044c1a0bf32a6063f6107536b00
parentb12ee62058c1366a776af8dd009313ab8aeeb1e5
Merge tag 'v3.6-rc6' into for-3.7

Linux 3.6-rc6 has all our bug fixes.

Conflicts (trivial overlap):
sound/soc/omap/am3517evm.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
drivers/mfd/twl4030-audio.c
sound/soc/codecs/arizona.c
sound/soc/codecs/mc13783.c
sound/soc/codecs/wm8904.c
sound/soc/soc-dapm.c
sound/soc/ux500/ux500_msp_i2s.c