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