Merge branch 'topic/lock' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 21 Nov 2012 02:09:46 +0000 (11:09 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 21 Nov 2012 02:09:46 +0000 (11:09 +0900)

Trivial merge