summaryrefslogtreecommitdiffstats
path: root/fs/xattr.c
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-05-22 20:28:35 +0200
committerJens Axboe <jens.axboe@oracle.com>2009-05-22 20:28:35 +0200
commit9bd7de51ee8537094656149eaf45338cadb7d7d4 (patch)
treea691987319dfcdb07de2bce619746f88d26882c4 /fs/xattr.c
parentMerge branch 'master' into for-2.6.31 (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryu... (diff)
downloadlinux-9bd7de51ee8537094656149eaf45338cadb7d7d4.tar.xz
linux-9bd7de51ee8537094656149eaf45338cadb7d7d4.zip
Merge branch 'master' into for-2.6.31
Conflicts: drivers/ide/ide-io.c Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs/xattr.c')
0 files changed, 0 insertions, 0 deletions