merge in jb-mr2-release history after reset to jb-mr2-dev
tree: 2cf1012bf319667999dc49c06aeb3896bc1e39d3
  1. kernel