summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-03-05 01:07:21 +0000
committerMark Brown <broonie@kernel.org>2015-03-05 01:07:21 +0000
commit4a7e0415703977dc61b410f3124ab59d56273f6a (patch)
tree2a6c069b32d20995f1a7b2220bb0edbd019acd85 /include
parent6a93dd249b9969f9b9d65d038d640a20cb0ffd6c (diff)
parentb6d6c6e95ff0e78f9b8393e6b9f25d5a4341ae1a (diff)
parent4da4608c91308d0d15dd022074724446c15710dc (diff)
parent34d7c3905adb9a9d8f8155857c76314125510817 (diff)
parent5bb400ce4a9b100a2dd3f5db17c4c76877cecade (diff)
downloadlinux-4a7e0415703977dc61b410f3124ab59d56273f6a.tar.bz2
Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/davinci', 'asoc/topic/gpiod' and 'asoc/topic/intel' into asoc-next