OSDN Git Service

Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/mr1/sensors/master' into...
authorViorel Suman <viorel.suman@intel.com>
Thu, 28 May 2015 12:26:30 +0000 (15:26 +0300)
committerViorel Suman <viorel.suman@intel.com>
Thu, 28 May 2015 12:26:32 +0000 (15:26 +0300)
commit369636bfccad7fbd432e48758b69d7bb91e2714e
tree7374d0d7cd2d92a8b24684905186ba408fbac2c4
parent378432a4f0cb62a7189340ee1424a529fcf2085a
parentc02faeee9fe19b87b086db160220d70f6c000b6a
Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/mr1/sensors/master' into v-master

git log --pretty=format:"%h %ad | %s%d [%an]" origin/abt/topic/gmin/l-dev/mr1/master..origin/abt/topic/gmin/l-dev/mr1/sensors/master:
  c02faee Tue May 26 16:26:34 2015 +0300 | Enforce frequency setup for distinct hr trigger and sensor rates (origin/abt/topic/gmin/l-dev/mr1/sensors/master, m/abt/topic/gmin/l-dev/mr1/master, v1) [Viorel Suman]
  6365d95 Fri May 29 10:57:17 2015 +0300 | Remove superfluous assignment [Adriana Reus]

git diff --stat origin/abt/topic/gmin/l-dev/mr1/master..HEAD:
  control.c | 15 ++++++++++-----
  1 file changed, 10 insertions(+), 5 deletions(-)

Change-Id: If1abe320166c7d4cc77b8547dbe5cdf4a5a84642
Signed-off-by: Viorel Suman <viorel.suman@intel.com>