OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c3b92c8
016fc6a
)
Merge remote-tracking branch 'remotes/josef/for-chris' into btrfs-next-stable
author
David Sterba
<dsterba@suse.cz>
Mon, 24 Oct 2011 12:47:57 +0000
(14:47 +0200)
committer
David Sterba
<dsterba@suse.cz>
Mon, 24 Oct 2011 12:47:57 +0000
(14:47 +0200)
1
2
fs/btrfs/ioctl.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
fs/btrfs/ioctl.c
Simple merge