Merge branch 'iov_iter' into for-next
authorAl Viro <viro@zeniv.linux.org.uk>
Sun, 12 Apr 2015 02:26:51 +0000 (22:26 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sun, 12 Apr 2015 02:26:51 +0000 (22:26 -0400)
1  2 
include/linux/uio.h
lib/iov_iter.c

Simple merge
diff --cc lib/iov_iter.c
Simple merge