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