Merge branch 'fix/samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 3 Apr 2013 17:15:57 +0000 (18:15 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 3 Apr 2013 17:15:57 +0000 (18:15 +0100)

Trivial merge