diff options
author | Mark Brown <broonie@kernel.org> | 2014-12-08 13:12:07 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-12-08 13:12:07 +0000 |
commit | 6e6d57d07a4fb995dfdf6da4b8ced206a28d0a8a (patch) | |
tree | 041c9fd32a34484cf08f1b9bf0423d881cdde2f2 /sound/soc/codecs/sgtl5000.c | |
parent | c9098c6120f7e4dd2d65ce3c3711d4d20380ef7b (diff) | |
parent | 6cfad789610342443923737a9def8b637151dc4d (diff) | |
parent | 8d213de7ffff614e3aa751a31a8980e1be3036e1 (diff) | |
parent | a5a267cf9ca9937b0ef946b502657ae7638282f6 (diff) | |
parent | e2dce944cc2bf22d0295330cbdcbd2ad7bd47cb4 (diff) |
Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/rockchip', 'asoc/topic/rt286' and 'asoc/topic/rt5631' into asoc-next