Merge branch 'kernel31' of code.vuplus.com:/opt/repository/openembedded into kernel31
authorschon <schon@dev03-server>
Fri, 25 Nov 2011 11:47:25 +0000 (20:47 +0900)
committerschon <schon@dev03-server>
Fri, 25 Nov 2011 11:47:25 +0000 (20:47 +0900)
commitffe483d2d8e89a08ab621439231b01e60d94ce58
tree66f4ad7b24841cf414edcd21676b15c0b4bf322b
parent61653dff854564eb388489b4c4fa13f630b089c4
parent568919442c1e0b72b5b9bcf37e1bb2ef9aa9981b
Merge branch 'kernel31' of code.vuplus.com:/opt/repository/openembedded into kernel31

Conflicts:
conf/distro/vuplus.conf
recipes/linux/linux-vusolo_3.1.1.bb
recipes/vuplus/vuplus-dvb-modules.bb
recipes/vuplus/vuplus-dvb-modules.bb