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