]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
projects / thirdparty / kernel / stable.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 27263e2 b367e47)
Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration
authorChris Mason <chris.mason@oracle.com>
Mon, 16 Jan 2012 20:26:17 +0000 (15:26 -0500)
committerChris Mason <chris.mason@oracle.com>
Mon, 16 Jan 2012 20:26:17 +0000 (15:26 -0500)
commitd756bd2d9339447c29bde950910586df8f8941ec
treef96aeb682bcc4fdcf75d080f260c809b9fbc4a1atree | snapshot
parent27263e28321db438bc43dc0c0be432ce91526224commit | diff
parentb367e47fb3a70f5d24ebd6faf7d42436d485fb2dcommit | diff
Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration

Conflicts:
fs/btrfs/volumes.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/disk-io.c diff1 | diff2 | blob | history
fs/btrfs/extent-tree.c diff1 | diff2 | blob | history
fs/btrfs/free-space-cache.c diff1 | diff2 | blob | history
fs/btrfs/ioctl.c diff1 | diff2 | blob | history
fs/btrfs/volumes.c diff1 | diff2 | blob | history
fs/btrfs/volumes.h diff1 | diff2 | blob | history
Mirror https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git