Message	SHA1
[media] altera-stapl: it is time to move out from staging ... [mchehab@redhat.com: Fix a merge conflict] Signed-off-by: Igor M. Liplianin <liplianin@netup.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Igor M. Liplianin   authored and   Mauro Carvalho Chehab   commited 2011-09-23 15:00:57 -03:00	cff4fa8415