diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:09 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:09 +0000 |
commit | f238479b6bfee938127c12c5f876127c1e4e5283 (patch) | |
tree | 845283b0c0760ecad87c368401821c63182d829b | |
parent | 699994d07e42bfbad6fbb564632ee8ebf6927a15 (diff) | |
parent | a465122ae388c4951d1b39ed0186e82c1f5bcfb0 (diff) | |
parent | d883641f87a42cffcdbbdc664fce1def20ed02b6 (diff) | |
parent | b5fbcbab50b4f8065666d3633f47722bf8969b34 (diff) | |
parent | cf0efa1c71c86b3ba731b9f3bad37ea4ceee6fbe (diff) | |
download | linux-stable-f238479b6bfee938127c12c5f876127c1e4e5283.tar.gz linux-stable-f238479b6bfee938127c12c5f876127c1e4e5283.tar.bz2 linux-stable-f238479b6bfee938127c12c5f876127c1e4e5283.zip |
Merge remote-tracking branches 'asoc/topic/bt-sco', 'asoc/topic/cs35l32', 'asoc/topic/cs42l52' and 'asoc/topic/cs42l56' into asoc-next