kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-11-13 07:31:07 +00:00
Code Issues Releases Packages Activity

Merge branch 'qgroup' of git://git.jan-o-sch.net/btrfs-unstable into for-linus

Browse source 
Conflicts:
	fs/btrfs/ioctl.c
	fs/btrfs/ioctl.h
	fs/btrfs/transaction.c
	fs/btrfs/transaction.h

Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:
Chris Mason 2012-07-25 16:11:38 -04:00
commit b478b2baa3
15 changed files with 2697 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files