summaryrefslogtreecommitdiffstats
path: root/lib/cpumask.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-04-09 06:00:30 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2015-04-09 06:01:38 +0200
commit237dae889051ed4ebf438b08ca6c0e7c54b97774 (patch)
tree0cbd9882d28f19875f5c1daf1698edaac985de0f /lib/cpumask.c
parentMerge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentfs: move struct kiocb to fs.h (diff)
downloadlinux-237dae889051ed4ebf438b08ca6c0e7c54b97774.tar.xz
linux-237dae889051ed4ebf438b08ca6c0e7c54b97774.zip
Merge branch 'iocb' into for-davem
trivial conflict in net/socket.c and non-trivial one in crypto - that one had evaded aio_complete() removal. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'lib/cpumask.c')
0 files changed, 0 insertions, 0 deletions