]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jun 2008 18:55:03 +0000 (11:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jun 2008 18:55:03 +0000 (11:55 -0700)
commite899536470ec83f2792092640148f2488961731b
tree7ec3ba86c9cd1cc73cca5ff3094524d30db6c44e
parentd83b14c0db5b238975990c0abda51521120106e9
parente4f3ec063421bdbcb93330e72aa3eeedb6a0d85a
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