aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/acl.c
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-12-22 09:49:28 +0100
committerJens Axboe <jaxboe@fusionio.com>2010-12-22 09:49:28 +0100
commit047b7bdab951b76d19b44388e35cf579ef91e448 (patch)
treefb4fb138b5768a4201ade62e35554cfd6f37d118 /fs/btrfs/acl.c
parentMerge branch 'for-2.6.38/core' into for-next (diff)
parentRevert "sd: implement sd_check_events()" (diff)
downloadlinux-dev-047b7bdab951b76d19b44388e35cf579ef91e448.tar.xz
linux-dev-047b7bdab951b76d19b44388e35cf579ef91e448.zip
Merge branch 'for-2.6.38/event-handling' into for-next
Diffstat (limited to 'fs/btrfs/acl.c')
0 files changed, 0 insertions, 0 deletions