From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Jun 2008 18:31:55 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/chrisw... 
X-Git-Tag: v2.6.26-rc6~34
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=156a9ea43acb609ac89d48dbb9f0d05ee903a12e;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'for-linus' of git://git./linux/kernel/git/chrisw/lsm-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6:
  capabilities: remain source compatible with 32-bit raw legacy capability support.
  LSM: remove stale web site from MAINTAINERS
---

156a9ea43acb609ac89d48dbb9f0d05ee903a12e