]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1332bcc f533ba4)
Merge bk://kernel.bkbits.net/davem/net-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 24 Aug 2004 05:43:49 +0000 (22:43 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 24 Aug 2004 05:43:49 +0000 (22:43 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux

1  2 
security/selinux/hooks.c patch | diff1 | diff2 | blob | history

diff --cc security/selinux/hooks.c
Simple merge
Linux kernels and configurations used by Zygo.