linux-toradex.git/include/misc/altera.h, branch v4.14-rc5

linux-toradex.git/include/misc/altera.h, branch v4.14-rc5 Linux kernel for Apalis and Colibri modules [media] altera-stapl: it is time to move out from staging 2011-09-23T18:00:57+00:00 Igor M. Liplianin liplianin@netup.ru 2011-09-23T14:17:41+00:00 cff4fa8415a3224a5abdd2b1dd7f431e4ea49366 [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>

[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>