summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-07-24 22:07:31 +0100
committerMark Brown <broonie@kernel.org>2016-07-24 22:07:31 +0100
commit3ceeda1cbee9f93bb5537c9b840d1f7e767d7c01 (patch)
tree25f128b3be3eb372d091af4c43850d26627f1fb4 /include/acpi
parent5600eab2dfe615f94f2bb762685cc39b22133759 (diff)
parent1708796fc1053eae3dcf648669f552967c210bd2 (diff)
parent1200a7d9b2c65ffb2dd673add65cd5dc95671489 (diff)
parenta01b89336f7a2f3ee1f98a89ba78c88f5547dc70 (diff)
parent272ee030ebc9da58a5796e6e26f78b77ecce7c21 (diff)
Merge remote-tracking branches 'asoc/topic/cs53l30', 'asoc/topic/cygnus', 'asoc/topic/da7219' and 'asoc/topic/davinci' into asoc-next