projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cfc442b c319310)
Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-linus
authorChris Mason <chris.mason@oracle.com>
Thu, 31 May 2012 20:50:28 +0000 (16:50 -0400)
committerChris Mason <chris.mason@oracle.com>
Thu, 31 May 2012 20:49:53 +0000 (16:49 -0400)
commit1e20932a23578bb1ec59107843574e259b96193f
tree844ae54293c4414fc4c232a36d0e4d4939dc35aatree | snapshot (tar.gz zip)
parentcfc442b69696b593cb442f09997dcb4cb5748171commit | diff
parentc31931088fd6cf953bd0868a2647b6c3928e6c96commit | diff
Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-linus

Conflicts:
fs/btrfs/ulist.h

Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/ctree.c diff1 | diff2 | blob | history
fs/btrfs/ctree.h diff1 | diff2 | blob | history
fs/btrfs/disk-io.c diff1 | diff2 | blob | history
fs/btrfs/extent-tree.c diff1 | diff2 | blob | history
fs/btrfs/extent_io.c diff1 | diff2 | blob | history
fs/btrfs/extent_io.h diff1 | diff2 | blob | history
fs/btrfs/ioctl.c diff1 | diff2 | blob | history
fs/btrfs/transaction.c diff1 | diff2 | blob | history
fs/btrfs/ulist.c diff1 | diff2 | blob | history
fs/btrfs/ulist.h diff1 | diff2 | blob | history