Merge branch 'codec'
authorkt920.kim <kt920.kim@samsung.com>
Tue, 6 Dec 2011 05:41:19 +0000 (14:41 +0900)
committerkt920.kim <kt920.kim@samsung.com>
Tue, 6 Dec 2011 05:41:19 +0000 (14:41 +0900)
1  2 
arch/x86/configs/i386_emul_defconfig
drivers/media/video/svcd.c

Simple merge
Simple merge