]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'asoc-omap' into for-3.7
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 22 Aug 2012 19:19:01 +0000 (20:19 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 22 Aug 2012 19:19:01 +0000 (20:19 +0100)
1  2 
sound/soc/omap/omap-mcbsp.c

Simple merge