diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-03 10:39:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-03 10:39:52 +0100 |
| commit | b12a1906be48d1d020e1e20550b93417c7c3d767 (patch) | |
| tree | 8e4a9b4e57a6abf9c0d81d99b40c758461874f09 | |
| parent | 9713d5d0c4d841c6a08bf2a0bd0728ff44f0c231 (diff) | |
| parent | b10ab7b838bdd86031aececcb386dc253ef3466f (diff) | |
| parent | e3048c3d2be5b4a1c6a66db3bf3829c77b7788e0 (diff) | |
Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/max98095' into asoc-next