Merge remote-tracking branch 'oe_21/master' into vuplus-3.0-next
authorhschang <chang@dev3>
Thu, 12 Mar 2015 04:33:39 +0000 (13:33 +0900)
committerhschang <chang@dev3>
Thu, 12 Mar 2015 04:37:18 +0000 (13:37 +0900)
commitd5ed73c8eb69b1df41a91be4c5a92fd8881eade9
tree354f2d3c98210dcb7dbc408349e26666cb44d295
parent7d88dacb383779dc332994dae0fee0beb002dcac
parent432c24518aea6538c76abac02362c00456b3251e
Merge remote-tracking branch 'oe_21/master' into vuplus-3.0-next

Conflicts:
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo.inc
meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb