Merge branch 'master' into codec
authorkt920.kim <kt920.kim@samsung.com>
Mon, 28 Nov 2011 17:19:02 +0000 (02:19 +0900)
committerkt920.kim <kt920.kim@samsung.com>
Mon, 28 Nov 2011 17:19:02 +0000 (02:19 +0900)
1  2 
arch/x86/configs/i386_emul_defconfig

Simple merge