tree 6e335b5da919c1b9adcf87dfdd6da16c09a99e77
parent 2b39535b9e54888649923beaab443af212b6c0fd
parent 4a787a3ff3f419c23ab0a5cef677fa441356b818
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1306031511 +0800
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1306031511 +0800

Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.40