summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-17 00:46:01 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-17 00:46:01 +0100
commit31f48fc8f226f968d6e6b9b9718abe8e16c51fe8 (patch)
treeb2f990f32448b097ec418d37c173483ebab18f54 /.mailmap
parentMerge branch 'for-3.19' of git://linux-nfs.org/~bfields/linux (diff)
parentisofs: Fix infinite looping over CE entries (diff)
downloadlinux-31f48fc8f226f968d6e6b9b9718abe8e16c51fe8.tar.xz
linux-31f48fc8f226f968d6e6b9b9718abe8e16c51fe8.zip
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull isofs and reiserfs fixes from Jan Kara: "A reiserfs and an isofs fix. They arrived after I sent you my first pull request and I don't want to delay them unnecessarily till rc2" * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: isofs: Fix infinite looping over CE entries reiserfs: destroy allocated commit workqueue
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions