From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Aug 2010 21:28:20 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: upstream/snapshot3+hdmi~13711
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd816a0d84377c4e87f55cbe934a23417f9f5743;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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:
  SELINUX: Fix build error.
---

cd816a0d84377c4e87f55cbe934a23417f9f5743