]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Mar 2008 14:44:21 +0000 (07:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Mar 2008 14:44:21 +0000 (07:44 -0700)
commit3b1daca9cb944be13b33d640a77c68511ba98e3e
treee2d1b561679a9811f1ddbca31b7bd35d45a3f7e9
parente5ac9704cf7c9a4386c29a1ff8f84b159a5c4d21
parenta1290ad14a1e17f19bf028e310bc59f7875155e7
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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