Merge branch 'vuplus-1.6k' of /home/shcheong/work/stb/sw/oe_1.6/bm750/openembedded...
authorschon <schon@dev03-server>
Fri, 31 Aug 2012 07:49:55 +0000 (16:49 +0900)
committerschon <schon@dev03-server>
Fri, 31 Aug 2012 07:49:55 +0000 (16:49 +0900)
commita4313a479986246e59d306e27180d2975423ecd2
tree1004e5028d3ccd1ac65bfcb5cde6ce44d7ee6860
parent033f169262aa493147b5022f004c1414e7b96d2f
parent3bf91d0e351e0463bb2f47e65db1d1b12013b2be
Merge branch 'vuplus-1.6k' of /home/shcheong/work/stb/sw/oe_1.6/bm750/openembedded into rk2637

Conflicts:
recipes/enigma2/enigma2.bb
recipes/linux/linux-vu7425-3.1.1/fix_cpu_proc.patch
recipes/linux/linux-vu7425-3.1.1/vu7425_defconfig
recipes/tuxbox/libdvbsi++.bb
recipes/vuplus/vuplus-dvb-modules.bb
conf/distro/vuplus.conf
recipes/enigma2/enigma2.bb
recipes/tasks/task-vuplus-enigma2.bb
recipes/tasks/task-vuplus-wlan.bb
recipes/tuxbox/libdvbsi++.bb
recipes/udev/udev_124.bb
recipes/vuplus/vuplus-dvb-modules.bb