OSDN Git Service

Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/sensors/master' into gmin...
authorAdriana Reus <adriana.reus@intel.com>
Thu, 23 Oct 2014 13:58:47 +0000 (16:58 +0300)
committerReus, Adriana <adriana.reus@intel.com>
Thu, 23 Oct 2014 15:15:17 +0000 (08:15 -0700)
commitd9b391e973857161f5c15b4c4bf9aa1605ce59cb
tree6d5bc234b357f29fb88495b4bd1c56a0e0964206
parentd1c0f7bdc959bb3841aaaf2c112b880c3c249718
parent5b9cb964cfd55e293f576fccc64d18930f652404
Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/sensors/master' into gmin/l-dev/master

git log --pretty=format:"%h %ad | %s%d [%an]" m/abt/topic/gmin/l-dev/master..origin/abt/topic/gmin/l-dev/sensors/master:
  5b9cb96 Thu Oct 16 10:33:57 2014 +0200 | IRDA-2056: Header file cleanup (origin/abt/topic/gmin/l-dev/sensors/master) [Patrick Porlan]
  af41894 Wed Oct 15 14:30:40 2014 +0200 | IRDA-2056: Rename continuous quirk flag and fix the location where it's used [Patrick Porlan]
  7755b1c Wed Oct 15 14:29:25 2014 +0200 | IRDA-2056: Cosmetic whitespace shuffling [Patrick Porlan]
  138a7ad Wed Oct 15 14:27:10 2014 +0200 | IRDA-2056: Link the terse flag to the variable we're now using to decide whether or not to operate in "driver only sending events on motion" mode. [Patrick Porlan]
  4b21c9f Wed Oct 15 14:22:02 2014 +0200 | IRDA-2056: Remove a superfluous check [Patrick Porlan]

git diff --stat m/abt/topic/gmin/l-dev/master..HEAD:
  control.c     |  4 ++--
  description.c |  7 +++----
  description.h | 35 +++++++++++++++--------------------
  enumeration.c | 59 ++++++++++++++++++++++-------------------------------------
  4 files changed, 42 insertions(+), 63 deletions(-)

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