Merge "sensors: device name changed to maru_sensor_[sensor_name]_1" into tizen
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 24 Jun 2014 04:44:46 +0000 (21:44 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 24 Jun 2014 04:44:46 +0000 (21:44 -0700)

Trivial merge