git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5766650)
Ceph: remove left-over reject file
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Dec 2014 02:47:01 +0000 (18:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Dec 2014 02:47:01 +0000 (18:47 -0800)
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>
fs/ceph/super.h.rej [deleted file] patch | blob | history

diff --cc fs/ceph/super.h.rej
Simple merge
Pandora Kernel Repository