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