Latest commit b516114 Apr 25, 2015 @ljalves ljalves Merge remote-tracking branch 'origin/master' into latest 
Conflicts:
	drivers/media/dvb-frontends/cx24117.h