diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-16 20:57:05 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-16 20:57:05 +0100 |
commit | ffd3c0260aeeb1fd4d36378d2e06e6410661dd0f (patch) | |
tree | b9503b99442b9701fab49a83295e60256827cdd2 /arch/arm/mach-s3c24xx/mach-h1940.c | |
parent | Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | btrfs: get rid of fdentry() (diff) | |
download | linux-ffd3c0260aeeb1fd4d36378d2e06e6410661dd0f.tar.xz linux-ffd3c0260aeeb1fd4d36378d2e06e6410661dd0f.zip |
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
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-h1940.c')
0 files changed, 0 insertions, 0 deletions