diff options
| author | Mark Brown | 2015-02-04 20:57:21 +0000 |
|---|---|---|
| committer | Mark Brown | 2015-02-04 20:57:21 +0000 |
| commit | 801a5656daf664edba8d07212d70241bbf79d474 (patch) | |
| tree | 456ea98fa431d05339eeee35bf4c46165f856e2e /sound/oss/msnd.h | |
| parent | cb6bfd3de48e285d74217f6e847135b9c81e92c0 (diff) | |
| parent | e46c93669349072f5caca853f5618cfa01b86008 (diff) | |
| parent | a37f1b8fdc912600c24f9d0d45d7046e50a031e4 (diff) | |
| parent | b8255930e0fbda841890ff6bb7154aa5fd62e143 (diff) | |
| parent | 39552d7ad1409d07ef278a97adbfbee02a272d25 (diff) | |
| parent | e7a0332f716d92b9a80c46fbd7d624c502984ca7 (diff) | |
Merge remote-tracking branches 'asoc/topic/tdm-slot', 'asoc/topic/tegra', 'asoc/topic/tlv320aic3x', 'asoc/topic/ts3a227e' and 'asoc/topic/ts3a277e' into asoc-next