OSDN Git Service

Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/sensors/master' into gmin...
authorAdriana Reus <adriana.reus@intel.com>
Thu, 18 Sep 2014 09:43:01 +0000 (12:43 +0300)
committerAdriana Reus <adriana.reus@intel.com>
Thu, 18 Sep 2014 09:43:29 +0000 (12:43 +0300)
git log --pretty=format:"%h %ad | %s%d [%an]" m/abt/topic/gmin/l-dev/master..origin/abt/topic/gmin/l-dev/sensors/master:
  ca5db17 Wed Sep 17 17:26:14 2014 +0300 | Setup some sanity limitations for magnetometer calibration (origin/abt/topic/gmin/l-dev/sensors/master) [Adriana Reus]
  642a2d2 Wed Sep 17 15:38:04 2014 +0300 | Change the uncalibrated vs calibrated order. [Adriana Reus]
  3dc768c Tue Sep 16 14:08:10 2014 +0300 | Don't calibrate gyro if terse driver [Adriana Reus]

git diff --stat m/abt/topic/gmin/l-dev/master..HEAD:
  calibration.h         |    3 +++
  compass-calibration.c |   18 ++++++++++++++++++
  control.c             |   19 +++++++++++--------
  transform.c           |    3 ++-
  4 files changed, 34 insertions(+), 9 deletions(-)

Change-Id: I08d7310a03dcacfc2285496d199873840191d3a2


Trivial merge