This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/media_tree.git tree:
Subject: [media] altera-stapl: it is time to move out from staging Author: Igor M. Liplianin <[email protected]> Date: Fri Sep 23 11:17:41 2011 -0300 [[email protected]: Fix a merge conflict] Signed-off-by: Igor M. Liplianin <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]> drivers/media/video/cx23885/cx23885-cards.c | 2 +- drivers/misc/Kconfig | 1 + drivers/misc/Makefile | 1 + drivers/misc/altera-stapl/Kconfig | 8 + drivers/misc/altera-stapl/Makefile | 3 + drivers/misc/altera-stapl/altera-comp.c | 142 ++ drivers/misc/altera-stapl/altera-exprt.h | 33 + drivers/misc/altera-stapl/altera-jtag.c | 1021 +++++++++++ drivers/misc/altera-stapl/altera-jtag.h | 113 ++ drivers/misc/altera-stapl/altera-lpt.c | 70 + drivers/misc/altera-stapl/altera.c | 2536 +++++++++++++++++++++++++++ drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/altera-stapl/Kconfig | 6 - drivers/staging/altera-stapl/Makefile | 3 - drivers/staging/altera-stapl/altera-comp.c | 142 -- drivers/staging/altera-stapl/altera-exprt.h | 33 - drivers/staging/altera-stapl/altera-jtag.c | 1021 ----------- drivers/staging/altera-stapl/altera-jtag.h | 113 -- drivers/staging/altera-stapl/altera-lpt.c | 70 - drivers/staging/altera-stapl/altera.c | 2536 --------------------------- drivers/staging/altera-stapl/altera.h | 49 - include/misc/altera.h | 49 + 23 files changed, 3978 insertions(+), 3977 deletions(-) --- http://git.linuxtv.org/media_tree.git?a=commitdiff;h=cff4fa8415a3224a5abdd2b1dd7f431e4ea49366 <diff discarded since it is too big> _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
