]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>
Sat, 2 Jul 2005 12:39:09 +0000 (13:39 +0100)
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>
Sat, 2 Jul 2005 12:39:09 +0000 (13:39 +0100)
1  2 
MAINTAINERS
fs/namei.c
security/selinux/hooks.c
security/selinux/ss/services.c

diff --cc MAINTAINERS
Simple merge
diff --cc fs/namei.c
Simple merge
Simple merge
Simple merge