Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Nov 2010 02:30:11 +0000 (18:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Nov 2010 02:30:11 +0000 (18:30 -0800)
commit814ce2521121c2459e16cea8c7221e157edbeddd
tree50c04090f09d6d9e491b3ecd1af5ff14b474e70b
parent0e15482566b752718e7225168380904f1d0cdfa3
parent6070bf3596f3b5a54091a08d5b2bc90c143dc264
Merge branch 'for-linus' of git://git./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()