| commit | 992ab12ac390a8b98b45d03f617481e6265811c0 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 18 Mar 2008 14:44:21 +0000 (18 07:44 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 18 Mar 2008 14:44:21 +0000 (18 07:44 -0700) | ||
| tree | e2d1b561679a9811f1ddbca31b7bd35d45a3f7e9 | treesnapshot (tar.gz zip) |
| parent | 92f53c6f1e47d92b40b1e9e1662b0056c783b962 | commitdiff |
| parent | 2e1479d95d02b43660fe03ab2c595ec9751a6f97 | commitdiff |
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
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
make selinux_parse_opts_str() static