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