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)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  kernel: Constify temporary variable in roundup()


Trivial merge