summaryrefslogtreecommitdiff
path: root/drivers/s390/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-17 18:47:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-17 18:47:01 -0800
commit44e8967d591686463e84a88b46b03beba3ab49fb (patch)
treeb2fc962f8d37b6dd1e40f471550dd7801f86b1ac /drivers/s390/crypto
parent57666509b70030a9483d13222bfec8eec5db07df (diff)
downloadlinux-next-44e8967d591686463e84a88b46b03beba3ab49fb.tar.gz
Ceph: remove left-over reject file
Neither Sage nor I noticed that Zheng Yan had mistakenly committed fs/ceph/super.h.rej as part of commit 31c542a199d7 ("ceph: add inline data to pagecache"). Remove it. Requested-by: Yan, Zheng <ukernel@gmail.com> Cc: Sage Weil <sweil@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/s390/crypto')
0 files changed, 0 insertions, 0 deletions