tree 3da4473f2168ff3ef075d57e6cfcc6dcabe6414b
parent b4f7a9d168d9f8204abf06d244a7938dd62b87b0
parent 905e36ae172c83a30894a3adefab7d4f850fcf54
author Emmanuel Grumbach <emmanuel.grumbach@intel.com> 1456904138 +0200
committer Emmanuel Grumbach <emmanuel.grumbach@intel.com> 1456904138 +0200

Merge branch 'fixes' into next

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>