diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-26 17:40:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-26 17:40:30 -0700 |
| commit | f583381f506dc53b9d3e98cf9d6577323eb3fcd2 (patch) | |
| tree | 5a53895acd1d3c6adab886910399780dd95d65e3 /drivers/i2c/busses/i2c-digicolor.c | |
| parent | 59953fba87e5e535657403cc6439d24187929559 (diff) | |
| parent | a3bdccc4e683f0ac69230707ed3fa20e7cf73a79 (diff) | |
Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"Filipe hit two problems in my block group cache patches. We finalized
the fixes last week and ran through more tests"
* 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: prevent list corruption during free space cache processing
Btrfs: fix inode cache writeout
Diffstat (limited to 'drivers/i2c/busses/i2c-digicolor.c')
0 files changed, 0 insertions, 0 deletions