summaryrefslogtreecommitdiff
path: root/fs/jfs
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-10-22 22:23:58 +0200
committerJames Morris <jmorris@namei.org>2011-10-22 22:23:58 +0200
commitc45ed235abf1b0b6666417e3c394f18717976acd (patch)
treee41dd99f2c217a8ce160b24d81a4aec1cccbfe02 /fs/jfs
parente0b057b406a33501a656dc8d67ea945d7bcdad61 (diff)
parent0e94ae17c857b3835a2b8ea46ce44b5da4e2cc5d (diff)
Merge branch 'master' of git://gitorious.org/smack-next/kernel into next
Diffstat (limited to 'fs/jfs')
0 files changed, 0 insertions, 0 deletions