[arvia@link200]player2 fix
[ariva@link200] smartcard fix
[ariva@link200] minor fix
Merge remote-tracking branch 'Duckbox-Developers/master'

Conflicts:
	player2_191/linux/drivers/media/dvb/stm/dvb/st-merger.c
	player2_191/linux/drivers/media/dvb/stm/dvb/st-pti.c