You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 9eeda9abd1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/ath5k/base.c net/8021q/vlan_core.c		16 years ago
..
include	Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into next	16 years ago
ss	Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into next	16 years ago
Kconfig	Update selinux info in MAINTAINERS and Kconfig help text	17 years ago
Makefile	SELinux: Add network port SID cache	17 years ago
avc.c	misc: replace NIPQUAD()	16 years ago
exports.c	SELinux: remove redundant exports	17 years ago
hooks.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	16 years ago
netif.c	SELinux fixups needed for preemptable RCU from -rt	17 years ago
netlabel.c	selinux: Cache NetLabel secattrs in the socket's security struct	16 years ago
netlink.c	SELinux: netlink.c whitespace, syntax, and static declaraction cleanups	17 years ago
netnode.c	SELinux: keep the code clean formating and syntax	17 years ago
netport.c	SELinux: keep the code clean formating and syntax	17 years ago
nlmsgtab.c	SELinux: nlmsgtab.c whitespace, syntax, and static declaraction cleanups	17 years ago
selinuxfs.c	SELinux: more user friendly unknown handling printk	17 years ago
xfrm.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6	17 years ago