Merge branch 'uaccess.__copy_to_user' of git://git.kernel.org/pub/scm/linux/kernel...

Pull uaccess/__copy_to_user updates from Al Viro:
 "Getting rid of __copy_to_user() callers - stuff that doesn't fit into
  other series"

* 'uaccess.__copy_to_user' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  dlmfs: convert dlmfs_file_read() to copy_to_user()
  esas2r: don't bother with __copy_to_user()

diff --cc fs/ocfs2/dlmfs/dlmfs.c
Simple merge