Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 17 Apr 2013 13:18:06 +0000 (14:18 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 17 Apr 2013 13:18:06 +0000 (14:18 +0100)

Trivial merge