Merge tag 'pull_req_20150803' of https://git.kernel.org/pub/scm/linux/kernel/git...