Merge branch 'devel' into upstream upstream upstream/1.0.4
authorImran Zaman <imran.zaman@linux.intel.com>
Fri, 13 Feb 2015 14:28:39 +0000 (16:28 +0200)
committerImran Zaman <imran.zaman@linux.intel.com>
Fri, 13 Feb 2015 14:39:07 +0000 (16:39 +0200)
commit44b2221838e87bdce8e81685a22360aac95fde48
tree58465da0d3e9ec9cacd0d696c902b73a65f0743c
parent688d28ad4bc4a0f5a182b03250074ca099a3137c
parente7bc25e11ba8252609219b41eec6e543339a6f99
Merge branch 'devel' into upstream

Change-Id: Id6207a54212597614043e4503aaad4ead6bc6ed9
Signed-off-by: Imran Zaman <imran.zaman@linux.intel.com>