diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-18 03:47:01 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-18 03:47:01 +0100 |
| commit | 44e8967d591686463e84a88b46b03beba3ab49fb (patch) | |
| tree | b2fc962f8d37b6dd1e40f471550dd7801f86b1ac /arch/sparc/mm/srmmu.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff) | |
| download | linux-44e8967d591686463e84a88b46b03beba3ab49fb.tar.xz linux-44e8967d591686463e84a88b46b03beba3ab49fb.zip | |
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 'arch/sparc/mm/srmmu.c')
0 files changed, 0 insertions, 0 deletions