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