reverting some changes affecting older kernel versions
Merge branch 'master' of /media/sf_privat/Projekte/Code/GIT/EMGD-Community/intel-binaries-linux

Conflicts:
	drm/pvr/services4/srvkm/env/linux/mmap.c