Fix CHANGELOG: we ended up not merging the btrfs driver for last night's release
Merge pull request #2888 from tianon/changelog-fix

Fix CHANGELOG: we ended up not merging the btrfs driver for last night's release