Merge "Merge branch 'codec'"

author yeongkyoon lee <yeongkyoon.lee@samsung.com>

Tue, 6 Dec 2011 12:16:41 +0000 (21:16 +0900)

committer Gerrit Code Review <gerrit2@system.s-core.co.kr>

Tue, 6 Dec 2011 12:16:41 +0000 (21:16 +0900)
author yeongkyoon lee <yeongkyoon.lee@samsung.com>
Tue, 6 Dec 2011 12:16:41 +0000 (21:16 +0900)
committer Gerrit Code Review <gerrit2@system.s-core.co.kr>
Tue, 6 Dec 2011 12:16:41 +0000 (21:16 +0900)
diff --cc arch/x86/configs/i386_emul_defconfig

index 01bd78786aff51aac1e06a431f4db3e5418a842a,d03a3473bf20eefaae55efc0d70931d2600ca118..da4529e93fb45b41e994f02d9833be6a8b908c45

mode 100755,100644..100644
--- 1/arch/x86/configs/i386_emul_defconfig
--- 2/arch/x86/configs/i386_emul_defconfig
+++ b/arch/x86/configs/i386_emul_defconfig
diff --cc ramfs/init
Simple merge
author	yeongkyoon lee <yeongkyoon.lee@samsung.com>
	Tue, 6 Dec 2011 12:16:41 +0000 (21:16 +0900)
committer	Gerrit Code Review <gerrit2@system.s-core.co.kr>
	Tue, 6 Dec 2011 12:16:41 +0000 (21:16 +0900)
		1	2
arch/x86/configs/i386_emul_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
ramfs/init	patch \|	diff1 \|	diff2 \|	blob \| history