summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-05 18:55:01 +0100
committerMark Brown <broonie@kernel.org>2015-06-05 18:55:01 +0100
commit19726b0ed568c178f9c53df82d775a3df468f57f (patch)
tree733038d8ed9745303624b5872436962f0e021d5a
parentcee77be0ad7e3730466887a0623456304aef873a (diff)
parente0ae225b7e96e50daaa3ca8d3cd2c944ce48e007 (diff)
parentaa3a0f2ec79b72acfb48ef8c326da711b2a096e6 (diff)
parentfa68cfd4c1d3f1a277777942966c9f94d78d1c53 (diff)
parent9a122de678e11fb70b85c6b319b4b1359d8fcb5e (diff)
parent79ffbf11b77d4ded9935cdd291a84936b7f003ef (diff)
downloadlinux-stable-19726b0ed568c178f9c53df82d775a3df468f57f.tar.gz
linux-stable-19726b0ed568c178f9c53df82d775a3df468f57f.tar.bz2
linux-stable-19726b0ed568c178f9c53df82d775a3df468f57f.zip
Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/ssm2518', 'asoc/topic/ssm2602', 'asoc/topic/ssm4567' and 'asoc/topic/sta32x' into asoc-next