diff options
| author | Mark Brown | 2016-03-13 15:16:53 +0700 |
|---|---|---|
| committer | Mark Brown | 2016-03-13 15:16:53 +0700 |
| commit | a391dbe09ac41adc5351a985f501a5866d73f220 (patch) | |
| tree | 2cf1574e7f797d0814b732505b901e55802b3ba2 /drivers/misc | |
| parent | 343b89087196388a17a323881881dff2543fff29 (diff) | |
| parent | c706f2e55f04d25d212e34186521a38e8a6e459e (diff) | |
| parent | 517e7a1537ae4663268be5d0c0ec62c563b9fc99 (diff) | |
| parent | 1f1e60c9cdd573be271130e44a23efed48e0578d (diff) | |
Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/bcm2835' and 'asoc/topic/cs42xx8' into asoc-next