OSDN Git Service

Merge remote-tracking branch 'origin/abt/topic/gmin/kitkat/sensors' into gmin/kitkat...
authorsuyyala <sridhar.uyyala@intel.com>
Sat, 28 Jun 2014 02:12:41 +0000 (19:12 -0700)
committersuyyala <sridhar.uyyala@intel.com>
Sat, 28 Jun 2014 02:13:06 +0000 (19:13 -0700)
commit64cf45171c61ee6e43ccf80383b80cf82b8c2cb5
tree1e17b8ad51c4335372e117e70bf1c8d624401300
parent08d9359c89c7a8686a9145e01e0c08d1b4d8258a
parent86ec10d14209c813c3751ff4bdab414ab094ce11
Merge remote-tracking branch 'origin/abt/topic/gmin/kitkat/sensors' into gmin/kitkat/master

git log --pretty=format:"%h %ad | %s%d [%an]" origin/abt/topic/gmin/kitkat/master..origin/abt/topic/gmin/kitkat/sensors:
  86ec10d Thu Jun 26 15:17:09 2014 +0200 | STPK-1429 Add a trace warning of unusually high sysfs read times (origin/abt/topic/gmin/kitkat/sensors, m/abt/topic/gmin/kitkat/master) [Patrick Porlan]
  0d868f7 Thu Jun 26 10:28:55 2014 +0200 | STPK-1429 Clean up a few traces and obscure pieces of code [Patrick Porlan]
  dece0ae Wed Jun 25 14:34:43 2014 +0200 | STPK-1429 Support "on change" event firing [Patrick Porlan]
  5e58419 Thu Jun 19 15:08:12 2014 +0200 | STPK-1429 Support floating point sampling rates [Patrick Porlan]
  fe7a4ab Thu Jun 19 11:19:28 2014 +0200 | STPK-1429 Fix single channel opt_scale specifier [Patrick Porlan]
  5380d64 Tue Jun 17 15:01:15 2014 -0700 | Reset channel sampling on enumeration [suyyala]

git diff --stat origin/abt/topic/gmin/kitkat/master..origin/abt/topic/gmin/kitkat/sensors:
  common.h      |   7 ++--
  control.c     | 101 +++++++++++++++++++++++++++++++++++-----------------------
  enumeration.c |   2 +-
  transform.c   |  21 +++++++++---
  utils.c       |  36 ++++++++++++++++++++-
  utils.h       |  11 ++++---
  6 files changed, 126 insertions(+), 52 deletions(-)

Change-Id: I3c13ce408c0e80cdd98efc368e2daf9ce71590a9
Signed-off-by: sridhar.uyyala <sridhar.uyyala@intel.com>