merge in jb-mr1-release history after reset to jb-mr1-dev
tree: 8cee5cc78c0d9aa398cdeeb9ec258f2f6d1d1a11
  1. kernel
  2. prima_wlan.ko