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