| commit | ffd3c0260aeeb1fd4d36378d2e06e6410661dd0f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Nov 16 11:57:05 2013 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Nov 16 11:57:05 2013 -0800 |
| tree | b9503b99442b9701fab49a83295e60256827cdd2 | |
| parent | 0891ad829d2a0501053703df66029e843e3b8365 [diff] | |
| parent | 54563d41a58be77e9bd9ef7af1ea4026cf0e7e07 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs fixes from Chris Mason: "This pull fixes the empty_zero_page bug that Heiko reported, and includes one more cleanup from Al Viro" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: btrfs: get rid of fdentry() btrfs: fix empty_zero_page misusage