tree 50c04090f09d6d9e491b3ecd1af5ff14b474e70b
parent 0e15482566b752718e7225168380904f1d0cdfa3
parent 6070bf3596f3b5a54091a08d5b2bc90c143dc264
author Linus Torvalds <torvalds@linux-foundation.org> 1289269811 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1289269811 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  kernel: Constify temporary variable in roundup()