OSDN Git Service

Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/mr1/sensors/master' into mr1
authorAdriana Reus <adriana.reus@intel.com>
Fri, 24 Apr 2015 12:17:54 +0000 (15:17 +0300)
committerReus, Adriana <adriana.reus@intel.com>
Thu, 23 Apr 2015 12:23:29 +0000 (13:23 +0100)
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:
  cd36e6b Sun Apr 19 16:20:16 2015 -0700 | Add support for IIO mounting_matrix (origin/abt/topic/gmin/l-dev/mr1/sensors/master, m/abt/topic/gmin/l-dev/mr1/master, rebase, new, clean) [Octavian Purdila]

git diff --stat origin/abt/topic/gmin/l-dev/mr1/master..HEAD:
  common.h      |  7 +++++++
  description.c | 35 +++++++++++++++++++++++++++++++++++
  description.h |  2 ++
  enumeration.c |  7 +++++--
  transform.c   | 13 +++++++++++++
  5 files changed, 62 insertions(+), 2 deletions(-)

Tracked-On: https://jira01.devtools.intel.com/browse/GMINL-8497
Change-Id: I75abd86bb62a9901a85eccf192c015041aee55ac
Signed-off-by: Adriana Reus <adriana.reus@intel.com>

Trivial merge