OSDN Git Service

Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/mr1/sensors/master' into...
authorViorel Suman <viorel.suman@intel.com>
Tue, 12 May 2015 09:08:24 +0000 (12:08 +0300)
committerViorel Suman <viorel.suman@intel.com>
Tue, 12 May 2015 09:09:05 +0000 (12:09 +0300)
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:
  3531d19 Tue Feb 3 14:48:11 2015 +0200 | Enable Gauss-2-uT conversion for interrupt mode magneto (origin/abt/topic/gmin/l-dev/mr1/sensors/master, m/abt/topic/gmin/l-dev/mr1/master, refs/published/v0, v0) [Viorel Suman]
  7b6c078 Fri May 1 12:16:34 2015 +0300 | Add support for using a hrtimer trigger. [Adriana Reus]

git diff --stat origin/abt/topic/gmin/l-dev/mr1/master..HEAD:
  common.h      |  3 +++
  control.c     | 12 +++++++++++-
  description.c |  3 +++
  description.h |  1 +
  enumeration.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
  transform.c   | 11 +++++++----
  6 files changed, 67 insertions(+), 7 deletions(-)

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

Trivial merge