diff options
author | Mark Brown <broonie@kernel.org> | 2015-06-22 10:24:17 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-06-22 10:24:17 +0100 |
commit | d21504d4c993838b31d970d392b1b78eb33cfd61 (patch) | |
tree | 163224cb230f4151197c52379b9d2d3d8151e200 /include/uapi | |
parent | 2cc5df6daeada938d1f90210b038f60c881a5102 (diff) | |
parent | 14ba3ec1de043260cecd9e828ea2e3a0ad302893 (diff) | |
parent | ebb6ad73e645b8f2d098dd3c41d2ff0da4146a02 (diff) | |
parent | 12c350050538c7dc779c083b7342bfd20f74949c (diff) | |
parent | a077e81ec61e07a7f86997d045109f06719fbffe (diff) |
Merge remote-tracking branches 'asoc/fix/wm8737', 'asoc/fix/wm8903', 'asoc/fix/wm8955' and 'asoc/fix/wm8960' into asoc-linus