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