From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Jun 2008 18:55:03 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux... 
X-Git-Tag: v2.6.26-rc7~19
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e899536470ec83f2792092640148f2488961731b;p=linux-2.6

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
---

e899536470ec83f2792092640148f2488961731b