Merge remote-tracking branches 'regmap/topic/ac97' and 'regmap/topic/headers' into...
authorMark Brown <broonie@kernel.org>
Fri, 21 Nov 2014 11:32:36 +0000 (11:32 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 21 Nov 2014 11:32:36 +0000 (11:32 +0000)

Trivial merge