]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 20 May 2010 22:58:22 +0000 (15:58 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 20 May 2010 22:58:22 +0000 (15:58 -0700)

Trivial merge