Merge branch 'topic/pxa' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 26 Mar 2013 21:54:47 +0000 (21:54 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 26 Mar 2013 21:54:47 +0000 (21:54 +0000)

Trivial merge