]> git.baikalelectronics.ru Git - kernel.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)
commitd5f0446d0ac5e1a0dd55e9a315f138ff215afa65
tree7ec3ba86c9cd1cc73cca5ff3094524d30db6c44e
parent2b1b005c70bf01ab1333d9c3fb17497bd285cafc
parentc2c494e6a6b06ad22c70c7f95ce5ce6780a2535b
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