]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'for-3.5' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 25 Apr 2012 10:31:26 +0000 (11:31 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 25 Apr 2012 10:31:26 +0000 (11:31 +0100)
commitebba4da1cd33eb12d6026d0746edd5d9eefde4d3
treed227607f0d4ddff3c7a88b611a2d70c37818b21e
parent45f4e3dee7a3b8fde30ea275feba81481767eb99
parentbec3d9a97324a9ef84cc1dfcb918432a86c58894
Merge branch 'for-3.5' into asoc-next

Conflicts:
sound/soc/blackfin/bf5xx-ssm2602.c
sound/soc/blackfin/bf5xx-ssm2602.c