]> 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, 8 Apr 2008 02:15:35 +0000 (19:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Apr 2008 02:15:35 +0000 (19:15 -0700)
commitbc60c884c65b10b8c179ecf6fa388715d7cc5896
treeb084b95ae3fc985e6f6f21157c783700c829de9a
parentef325d454685bece7cef698dd8d3145be0314e44
parentba4e47c2dbadba1b333b227482e016b81d9f0299
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:
  SELinux: more GFP_NOFS fixups to prevent selinux from re-entering the fs code