diff options
author | Mark Brown <broonie@linaro.org> | 2014-08-04 16:31:55 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-08-04 16:31:55 +0100 |
commit | b0ae27c477b19d1da015e6ace0a5707d4173ff8b (patch) | |
tree | ea756e46641115042acdd5a8392bb70e57abe608 /sound/soc/sh | |
parent | 6aa63a25c0ba64f531de3d0597f642662c1c7ce3 (diff) | |
parent | b5d4f4a53f275afa1d066ace6a9fa6995337ead9 (diff) | |
parent | 55b219440b255f9b9064c621550d29e5f4f8c20f (diff) | |
parent | 90f601efc886ee5881594c5d931b76775975e155 (diff) | |
parent | 1657caf5d8c5f96528bb6b041028174ee2681681 (diff) | |
parent | dd56ebadf4bfccb47a3b82d0b01a99c22967abc8 (diff) |
Merge remote-tracking branches 'asoc/topic/rl6231', 'asoc/topic/rockchip', 'asoc/topic/rt286', 'asoc/topic/rt5640' and 'asoc/topic/rt5645' into asoc-next