Merge branch 'develop_linux_3.14' into platform_2.4
authorSooyoung Ha <yoosah.ha@samsung.com>
Tue, 12 Jul 2016 11:12:54 +0000 (20:12 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Tue, 12 Jul 2016 11:13:00 +0000 (20:13 +0900)
Change-ID: I58da69630791b33259b365e2e427f721f83c7009
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

Trivial merge