diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 10:49:23 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 10:49:23 -0800 |
commit | 90804ed61f24712975fa12f8a1fc12cd46ef7d59 (patch) | |
tree | dc29bf572984776cd97d9470ad58ec102b2b9cda /net/xfrm/xfrm_state.c | |
parent | 30b02c4b2a1eb6b6ca83e31c6b65f63076a03c5b (diff) | |
parent | 4ea7772f828a2f1cf6fbf96a3e6f99ae149d2724 (diff) | |
download | op-kernel-dev-90804ed61f24712975fa12f8a1fc12cd46ef7d59.zip op-kernel-dev-90804ed61f24712975fa12f8a1fc12cd46ef7d59.tar.gz |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull UDF & jbd fixes from Jan Kara:
"A cleanup of JBD log messages and UDF fix of a lockdep warning"
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
udf: Fix lockdep warning from udf_symlink()
jbd: Revise KERN_EMERG error messages
Diffstat (limited to 'net/xfrm/xfrm_state.c')
0 files changed, 0 insertions, 0 deletions