Merge branch 'for-linus' into for-linus2
authorJens Axboe <axboe@fb.com>
Fri, 5 Aug 2016 21:32:16 +0000 (15:32 -0600)
committerJens Axboe <axboe@fb.com>
Fri, 5 Aug 2016 21:32:16 +0000 (15:32 -0600)
commitb597f842bafe177c66a643934cea7c62763aa33e
tree2170528be9e6ca30ea6fbc7964bdb1f36029f70d
parent6c84239d595dc6ffe39f0f03dae2f64ed200db95
parentabf545484d31b68777a85c5c8f5b4bcde08283eb
Merge branch 'for-linus' into for-linus2
fs/btrfs/extent_io.c