Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/mr1/sensors/master' into mr1

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:
  580f18a Tue Apr 14 14:21:58 2015 +0200 | GMINL-7944: Ignore ALS intensity if illuminance is available (origin/abt/topic/gmin/l-dev/mr1/sensors/master) [Patrick Porlan]
  3068a36 Fri Apr 10 19:06:05 2015 +0200 | GMINL-7944: Introduce internal sensor types for ALS [Patrick Porlan]
  823fab6 Mon Apr 13 17:05:17 2015 +0200 | GMINL-7944: Add quirks for disabling data acquisition methods [Patrick Porlan]

git diff --stat origin/abt/topic/gmin/l-dev/mr1/master..HEAD:
  control.c       |  9 ++++--
  description.c   | 17 ++++++++---
  description.h   |  5 +++-
  enumeration.c   | 91 ++++++++++++++++++++++++++++++++++++++++++++++-----------
  enumeration.h   |  7 +++++
  iio-sensors.txt |  3 ++
  transform.c     |  7 +++--
  7 files changed, 112 insertions(+), 27 deletions(-)

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