Merge branch 'develop_linux_3.14' into platform_2.4
authorJinhyung Jo <jinhyung.jo@samsung.com>
Tue, 18 Oct 2016 07:59:48 +0000 (16:59 +0900)
committerJinhyung Jo <jinhyung.jo@samsung.com>
Tue, 18 Oct 2016 08:11:45 +0000 (17:11 +0900)
Change-Id: Ib92f508d4bc12f8554c1a05981ee127b8897f3da
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

Trivial merge