diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-16 15:46:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-16 15:46:01 -0800 |
| commit | 31f48fc8f226f968d6e6b9b9718abe8e16c51fe8 (patch) | |
| tree | b2f990f32448b097ec418d37c173483ebab18f54 /crypto/proc.c | |
| parent | 0b233b7c79d2ba92c7fb5d60d4116693f1b3b0fe (diff) | |
| parent | f54e18f1b831c92f6512d2eedb224cd63d607d3d (diff) | |
| download | op-kernel-dev-31f48fc8f226f968d6e6b9b9718abe8e16c51fe8.zip op-kernel-dev-31f48fc8f226f968d6e6b9b9718abe8e16c51fe8.tar.gz | |
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 'crypto/proc.c')
0 files changed, 0 insertions, 0 deletions
