]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b82d9eb 6a49d32)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs...
authorChris Mason <chris.mason@fusionio.com>
Wed, 20 Feb 2013 19:05:45 +0000 (14:05 -0500)
committerChris Mason <chris.mason@fusionio.com>
Wed, 20 Feb 2013 19:05:45 +0000 (14:05 -0500)
commit01a7931bb3355cf665c8b99689b8b9bb149cc17c
treede7cf0825605aa6acf33a8d107003efd7aedbe72tree | snapshot
parentb82d9eb10fa98f8229357371867818e4b6750349commit | diff
parent6a49d32cf37d64f1ca552147b621b0c463e354efcommit | diff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into for-linus-3.9

Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Conflicts:
fs/btrfs/disk-io.c
fs/btrfs/disk-io.c diff1 | diff2 | blob | history
fs/btrfs/extent-tree.c diff1 | diff2 | blob | history
fs/btrfs/file.c diff1 | diff2 | blob | history
fs/btrfs/inode.c diff1 | diff2 | blob | history
fs/btrfs/ioctl.c diff1 | diff2 | blob | history
fs/btrfs/ordered-data.h diff1 | diff2 | blob | history
include/uapi/linux/Kbuild diff1 | diff2 | blob | history
Linux Kernel Source Tree.