]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 12 May 2010 08:39:48 +0000 (10:39 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 12 May 2010 08:39:48 +0000 (10:39 +0200)
1  2 
arch/arm/plat-omap/include/plat/mcbsp.h
sound/core/pcm_native.c

Simple merge