merge in jb-mr1-release history after reset to jb-mr1-dev
tree: ce01479c9a470de6de27511e6a4370b9631e4b8d
  1. kernel