]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Nov 2008 20:34:22 +0000 (12:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Nov 2008 20:34:22 +0000 (12:34 -0800)
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
  udf: Fix BUG_ON() in destroy_inode()


Trivial merge