Merging Linux kernel module code files from client-server branch. Common files have already been merged (manually).