Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 May 2010 18:17:43 +0000 (11:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 May 2010 18:17:43 +0000 (11:17 -0700)
commitd515e86e639890b33a09390d062b0831664f04a2
tree37aea609704ce28ad44840279b95725e07c19a43
parent79c4581262e225a7c96d88b632b05ab3b5e9a52c
parent2f07a88b30f510c7625d75cdf286903b465350a0
Merge branch 'for_linus' of git://git./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
fs/udf/file.c