android_kernel_xiaomi_sm8350/security/selinux
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
2008-11-06 22:43:03 -08:00
..
include Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into next 2008-10-11 09:26:14 +11:00
ss Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into next 2008-10-11 09:26:14 +11:00
avc.c misc: replace NIPQUAD() 2008-10-31 00:56:49 -07:00
exports.c
hooks.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-11-06 22:43:03 -08:00
Kconfig
Makefile
netif.c
netlabel.c selinux: Cache NetLabel secattrs in the socket's security struct 2008-10-10 10:16:33 -04:00
netlink.c
netnode.c
netport.c
nlmsgtab.c
selinuxfs.c
xfrm.c