Merge remote-tracking branch 'lsk/v3.10/topic/of' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Sat, 17 Jan 2015 13:23:04 +0000 (13:23 +0000)
committerMark Brown <broonie@kernel.org>
Sat, 17 Jan 2015 13:23:04 +0000 (13:23 +0000)

Trivial merge