Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2011 00:29:38 +0000 (17:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2011 00:29:38 +0000 (17:29 -0700)
commit374e55251cacfb68d331bb8a574b2de8160aacc2
treebfd63d39be388c59157610b410003c7dcd4f0963
parent978ca164bd9f30bd51f71dad86d8c3797f7add76
parent6f644e5f97cc8dcb8dc7133562159cc20d27c38f
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: Fix compiler warning
  udf: Convert UDF to new truncate calling sequence