diff options
| author |   Chris Mason <chris.mason@oracle.com> | 2011-05-28 07:00:39 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-28 07:00:39 -0400 |
| commit | ff5714cca971848963b87d6b477c16ca8abbaa54 (patch) | |
| tree | 17ee34b9b5e00804df4059503f82f6f1d94383a9 /drivers/i2c/algos/i2c-algo-bit.c | |
| parent | Btrfs: use the device_list_mutex during write_dev_supers (diff) | |
| parent | Btrfs: leave spinning on lookup and map the leaf (diff) | |
| download | wireguard-linux-ff5714cca971848963b87d6b477c16ca8abbaa54.tar.xz wireguard-linux-ff5714cca971848963b87d6b477c16ca8abbaa54.zip | |
Merge branch 'for-chris' of
git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work into for-linus
Conflicts:
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/transaction.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'drivers/i2c/algos/i2c-algo-bit.c')
0 files changed, 0 insertions, 0 deletions