diff options
| author | Mark Brown <broonie@kernel.org> | 2016-03-13 15:17:47 +0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-13 15:17:47 +0700 |
| commit | b25d2803e900bde8116b45322e8bb6e84044e249 (patch) | |
| tree | 61ff4d51aad2e9afa87a7b0edaeac9513e2ea048 /include/sound/pcm_oss.h | |
| parent | 4bfd5ba31fa989ed2b9fe5c22d4265dc1f9b9a68 (diff) | |
| parent | c77dd678a7659d58625bd3b3a36d1329d9e7d44c (diff) | |
| parent | c62db3d5abf89ca5502c7fe1f869c2862e48336d (diff) | |
| parent | ba4bc32eaa39ba7687f0958ae90eec94da613b46 (diff) | |
| parent | 712a8038cc24dba668afe82f0413714ca87184e0 (diff) | |
Merge remote-tracking branches 'asoc/topic/rt5640', 'asoc/topic/rt5659', 'asoc/topic/samsung' and 'asoc/topic/ssm4567' into asoc-next