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)
commit65fdd5c05a02b15bbfa5b0f4f050fdb25b9227f1
treed2a22f1ac24d8b4269e9011db83e1d3b1318408d
parent223157121404a7ca4deaf2aa31a57cad8d133d07
parente9c039052be59753e6bcc7c8b59763899dc1161c
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