Merge remote-tracking branch 'asoc/topic/of' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 11 Feb 2013 11:06:38 +0000 (11:06 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 11 Feb 2013 11:06:38 +0000 (11:06 +0000)
commit556d8b55d083ad487067680feaf179664172bd4e
tree36005d676bd1b7aeb4f3ff7dcda3f22bde051161
parentf0f3214e8be1068121ba829fcd8c1c22b5bd6975
parent8c2d6a9f9cfa59acfa63ee88e70d58f0ba3eaf21
Merge remote-tracking branch 'asoc/topic/of' into asoc-next
include/sound/soc-dai.h
include/sound/soc.h
sound/soc/soc-core.c