Removal to get newest prima
Add prima folder
Merge branch 'rb_jb_mr1.1' of https://github.com/chadouming/mako into rb_jb_mr1.1

Conflicts:
	drivers/staging/prima