Merge "Revert "maru_fb : Add a framebuffer device for Tizen emulator"" into tizen_lin...
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 30 Apr 2014 01:06:58 +0000 (18:06 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 30 Apr 2014 01:06:58 +0000 (18:06 -0700)
commit40caedf55abff358ac650061daa4bd5ec48d9ef4
tree5db875447434a1f117af60de1460e6d8d9f7da5e
parent88c83fa371750771bfab2eedb4d8a70510ebbd4a
parent41b54d216f33a0c54006cb1066d92cc7d9756a22
Merge "Revert "maru_fb : Add a framebuffer device for Tizen emulator"" into tizen_linux_3.12
arch/x86/configs/i386_tizen_emul_defconfig
drivers/maru/Kconfig
drivers/maru/Makefile