summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-07 19:15:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-07 19:15:35 -0700
commit7180c4c9e09888db0a188f729c96c6d7bd61fa83 (patch)
treeb084b95ae3fc985e6f6f21157c783700c829de9a /.mailmap
parent4c3b01f71181a52ab7735a7c52b1aa2232826075 (diff)
parent869ab5147e1eead890245cfd4f652ba282b6ac26 (diff)
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
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions