summaryrefslogtreecommitdiff
path: root/include/media/v4l2-ioctl.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-08 13:11:50 (GMT)
committerMark Brown <broonie@kernel.org>2014-12-08 13:11:50 (GMT)
commit1f491557d279aedc1d74d05676f015022e05b06a (patch)
tree931245a2b33a2a3102fb822995167ee4b7b0319d /include/media/v4l2-ioctl.h
parent4aad340f1b1930d42b3be25e0013fe7d7976f5be (diff)
parente48d73c697b77b798a82e86c937fc41e597a1471 (diff)
parent2849bde56aac38645c5ed2af3971358b89a929f6 (diff)
parent5c9dc0898f343473efa3056fff9d5a9fbd577272 (diff)
parente9c7f34a7eba13e1a53212246c607d13574f9eff (diff)
parentde82bf6c055e1f426845e7e140c7d48dd70b6d16 (diff)
downloadlinux-1f491557d279aedc1d74d05676f015022e05b06a.tar.xz
Merge remote-tracking branches 'asoc/topic/ak4671', 'asoc/topic/alc5623', 'asoc/topic/alc5632', 'asoc/topic/arizona' and 'asoc/topic/atmel' into asoc-next