Merge "merge maru_pm.c" into tizen_qemu_1.5.1
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 9 Jul 2013 10:42:08 +0000 (19:42 +0900)
committerGerrit Code Review <gerrit2@system.s-core.co.kr>
Tue, 9 Jul 2013 10:42:09 +0000 (19:42 +0900)

Trivial merge