From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Mar 2008 14:44:21 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v3.12-rc1~22373
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=992ab12ac390a8b98b45d03f617481e6265811c0;p=kernel%2Fkernel-generic.git

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:
  make selinux_parse_opts_str() static
---

992ab12ac390a8b98b45d03f617481e6265811c0