diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:10 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:10 +0000 |
commit | 6d5c729daba6af6997d66a2a635fd1ec519c7f5c (patch) | |
tree | f45b867ff0688027061038c667922f9fa4f836c0 /sound/soc/atmel/sam9g20_wm8731.c | |
parent | f238479b6bfee938127c12c5f876127c1e4e5283 (diff) | |
parent | cd2ee8ad55a1728f291a760cece9ceac11462b9e (diff) | |
parent | ddaca25aa4dade234163290f6a9e091e7f57b36a (diff) | |
parent | caa1d794cca96c16e4a2f81697f3d15a588c4b02 (diff) |
Merge remote-tracking branches 'asoc/topic/cs42l73', 'asoc/topic/dai' and 'asoc/topic/davinci' into asoc-next