Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Jan 2014 18:49:23 +0000 (10:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Jan 2014 18:49:23 +0000 (10:49 -0800)
commit90804ed61f24712975fa12f8a1fc12cd46ef7d59
treedc29bf572984776cd97d9470ad58ec102b2b9cda
parent30b02c4b2a1eb6b6ca83e31c6b65f63076a03c5b
parent4ea7772f828a2f1cf6fbf96a3e6f99ae149d2724
Merge branch 'for_linus' of git://git./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