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