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)
commit0faa90880331386ac86ca78d52692c7a94051eab
tree7cb9311c118a2e766ae378a433421130bac32e8c
parent1f07e988290fc45932f5028c9e2a862c37a57336
parentb68e418c445e8a468634d0a7ca2fb63bbaa74028
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  selinux: support 64-bit capabilities