diff options
| author |   Chris Mason <chris.mason@oracle.com> | 2011-12-15 13:43:49 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-12-15 13:43:49 -0500 |
| commit | 567a45e917343c952806bb9f5c19aab0139bd519 (patch) | |
| tree | b1d6dac31a3a2836d24662139f21bb1ddc2522d3 /net/unix/af_unix.c | |
| parent | Btrfs: deal with NULL srv_rsv in the delalloc inode reservation code (diff) | |
| parent | Btrfs: only set cache_generation if we setup the block group (diff) | |
| download | wireguard-linux-567a45e917343c952806bb9f5c19aab0139bd519.tar.xz wireguard-linux-567a45e917343c952806bb9f5c19aab0139bd519.zip | |
Merge branch 'for-chris' of http://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work into integration
Conflicts:
fs/btrfs/inode.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions