diff options
author | Mark Brown <broonie@linaro.org> | 2014-08-01 19:21:53 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-08-01 19:21:53 +0100 |
commit | 166fe2e9dc4eddc79ccf0f7840080b41af8ebe9e (patch) | |
tree | 876ca6d9389edabdec87e625b657b1a01c824467 /drivers/misc | |
parent | eba444599239353ef052a48a6a49219649c0b03f (diff) | |
parent | 27204ca8b981160c3b65cdc226c9070f76cbbd36 (diff) | |
parent | 2ad76541026ba5c6c93b5a5a6f1418aa89fa5f34 (diff) | |
parent | bedd4b1993ecb7228f8e5d6673e25d4482bd302b (diff) | |
parent | dfaf535665faa4b5aba4b59633f6b724a467c96e (diff) |
Merge remote-tracking branches 'asoc/topic/ak4642', 'asoc/topic/ak5386', 'asoc/topic/arizona' and 'asoc/topic/atmel' into asoc-next