summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-12 19:49:22 +0100
committerMark Brown <broonie@kernel.org>2015-04-12 19:49:22 +0100
commit7667428f80526d908124e0647ac5dbe3dad88900 (patch)
tree22c88411d231ff65ad24c2affa73c30b044e1330 /include/uapi
parentff096eae2ef7d5f1c62a340a4b670912c2df5b98 (diff)
parentf263fa3e0f0b1d610f7a9d72a91fe67059d5564f (diff)
parent905a808664402dec0ac11376833e79da4ae7b2fd (diff)
parent99d422341376443a98ef22d0f0003b3381f32186 (diff)
parent1a60667fc81fdab3733a1d41480da3a5d0ccecea (diff)
parent159366ea38706402e8ebd0f55eef52931333deac (diff)
Merge remote-tracking branches 'asoc/topic/wm2200', 'asoc/topic/wm5100', 'asoc/topic/wm8731', 'asoc/topic/wm8804' and 'asoc/topic/wm8996' into asoc-next