From: yeongkyoon lee <yeongkyoon.lee@samsung.com>
Date: Tue, 6 Dec 2011 12:16:41 +0000 (+0900)
Subject: Merge "Merge branch 'codec'"
X-Git-Tag: 2.2.1_release^2~182^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=237b4b181819b685f4204882872c0d925597c211;p=sdk%2Femulator%2Femulator-kernel.git

Merge "Merge branch 'codec'"
---

237b4b181819b685f4204882872c0d925597c211
diff --cc arch/x86/configs/i386_emul_defconfig
index 01bd78786aff,d03a3473bf20..da4529e93fb4
mode 100755,100644..100644
--- a/arch/x86/configs/i386_emul_defconfig
+++ b/arch/x86/configs/i386_emul_defconfig