]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Jun 2011 18:21:09 +0000 (19:21 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Jun 2011 18:21:09 +0000 (19:21 +0100)
commit45cba26472b28768d5c9cf20012e866867d60c51
treed2a22f1ac24d8b4269e9011db83e1d3b1318408d
parent2786dcdade35e704c165cf542f2b1ebd462ae2a3
parentfc92cc3dd60365652b563774d4c629664c68e972
Merge branch 'for-3.0' into for-3.1

Trival fixup for move of I/O code into separate file.

Conflicts:
sound/soc/soc-cache.c
include/sound/soc.h
sound/soc/soc-io.c