Merge branch 'master' into linux-next

* master:
  Revert "epoll: use freezable blocking call"