summaryrefslogtreecommitdiff
path: root/include/acpi/acoutput.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-03-06 21:10:56 +0000
committerMark Brown <broonie@kernel.org>2015-03-06 21:10:56 +0000
commit60c1beeff40b04097298e10640580f62420a55ca (patch)
tree317630324a75b72b8ff8f3d7fe8eda359706580c /include/acpi/acoutput.h
parent13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff)
parent76e1d14b316d6f501ebc001e7a5d86b24ce5b615 (diff)
parentc6331ba3d2d68758f36dbc3e09e648d312c24d97 (diff)
parentc9dafb27c84412fe4b17c3b94cc4ffeef5df1833 (diff)
parentf165ed63370cfcc3a459cbd855822559f375a538 (diff)
parentcd6fa8d2ca53cac3226fdcffcf763be390abae32 (diff)
parent006110476478c69c399d0cd25888eefab0e69267 (diff)
Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/doc', 'spi/fix/dw', 'spi/fix/img-spfi', 'spi/fix/pl022' and 'spi/fix/ti-qspi' into spi-linus