]> 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)
commit5197a6ab2ae3f78f89bd8fe07e219b271e00ca3c
treed2a22f1ac24d8b4269e9011db83e1d3b1318408d
parent30d0772aa07b3649e8eb308fdfaf27e0ac6d055a
parent9dd3be1a7e285b4a0eef1b1cca4563a56a03cf52
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