]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
projects / mirror_ubuntu-kernels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a66e7cc b6f3409)
Merge branch 'btrfs-3.0' into for-linus
authorChris Mason <chris.mason@oracle.com>
Tue, 20 Sep 2011 18:49:29 +0000 (14:49 -0400)
committerChris Mason <chris.mason@oracle.com>
Tue, 20 Sep 2011 18:49:29 +0000 (14:49 -0400)
1  2 
fs/btrfs/ioctl.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/ioctl.c
Simple merge
Ubuntu combined Linux kernel mirror