summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-03-18 23:07:38 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2016-03-18 23:07:38 +0300
commit8b23a8ce1094f25a85826e25217c5b9779a4f5aa (patch)
tree09a59f171c61b9d1c8c22c1791aa07dd35a7eb75
parentf93812846f31381d35c04c6c577d724254355e7f (diff)
parented782b5a70a016dbfe503089fd5c11dd74953cc4 (diff)
parentd6785d9152147596f60234157da2b02540c3e60f (diff)
parent8e0b60b96ba06d826a2b26e23b1986853a4e5291 (diff)
downloadlinux-8b23a8ce1094f25a85826e25217c5b9779a4f5aa.tar.xz
Merge branches 'work.lookups', 'work.misc' and 'work.preadv2' into for-next