Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 11 Feb 2008 17:21:26 +0000 (09:21 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 11 Feb 2008 17:21:26 +0000 (09:21 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  selinux: support 64-bit capabilities


Trivial merge