forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge git://git.jan-o-sch.net/btrfs-unstable into for-linus

Browse source 
Conflicts:
	fs/btrfs/transaction.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason 2012-03-28 20:33:40 -04:00
commit 98961a7e43
5 changed files with 73 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fs/btrfs/super.c
View file

@ -1541,6 +1541,8 @@ static int __init init_btrfs_fs(void)
if (err)
goto unregister_ioctl;
btrfs_init_lockdep();
printk(KERN_INFO "%s loaded\n", BTRFS_BUILD_VERSION);
return 0;