tree 37aea609704ce28ad44840279b95725e07c19a43
parent 79c4581262e225a7c96d88b632b05ab3b5e9a52c
parent 2f07a88b30f510c7625d75cdf286903b465350a0
author Linus Torvalds <torvalds@linux-foundation.org> 1274465863 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1274465863 -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: BKL ioctl pushdown