Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
authorTakashi Iwai <tiwai@suse.de>
Tue, 5 Jul 2011 05:33:23 +0000 (07:33 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 5 Jul 2011 05:33:23 +0000 (07:33 +0200)
commit56aa53391059e3730a304da4dd96b7b123b9fb75
tree35d228687f9d15509cd39b9797adef4cf047906e
parent1ae4e9b99682adfe9ae170ed593f26fe89eb65b5
parent404b566569cdcba71e0ee875d08053486309e56e
Merge branch 'for-3.1' of git://git./linux/kernel/git/lrg/asoc-2.6 into topic/asoc
sound/soc/omap/Kconfig
sound/soc/omap/Makefile