tree 7ec3ba86c9cd1cc73cca5ff3094524d30db6c44e
parent d83b14c0db5b238975990c0abda51521120106e9
parent e4f3ec063421bdbcb93330e72aa3eeedb6a0d85a
author Linus Torvalds <torvalds@linux-foundation.org> 1213815303 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1213815303 -0700

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
  udf: restore UDFFS_DEBUG to being undefined by default