Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Apr 2010 01:36:34 +0000 (18:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Apr 2010 01:36:34 +0000 (18:36 -0700)
commit50fc88cb03786a79e9982d9d8dfb3fd225de9099
tree1d1812c58ab4dd5d5ddc9b75383618e24a00364e
parent4505a4938917f4872efcc90bc1e5f4f0ce903b47
parentc15d0fc0fc399d2639240b35ad7ed93ed5a59412
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: add speciffic ->setattr callback
  udf: potential integer overflow