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