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

SELinux: remove redundant exports

2008-04-19 09:52:36 +10:00

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

Update selinux info in MAINTAINERS and Kconfig help text

2008-09-12 00:44:08 +10:00

Makefile

SELinux: Add network port SID cache

2008-04-18 20:26:16 +10:00

netif.c

SELinux fixups needed for preemptable RCU from -rt

2008-04-22 15:37:23 +10:00

netlabel.c

selinux: Cache NetLabel secattrs in the socket's security struct

2008-10-10 10:16:33 -04:00

netlink.c

SELinux: netlink.c whitespace, syntax, and static declaraction cleanups

2008-04-21 19:05:05 +10:00

netnode.c

SELinux: keep the code clean formating and syntax

2008-07-14 15:01:36 +10:00

netport.c

SELinux: keep the code clean formating and syntax

2008-07-14 15:01:36 +10:00

nlmsgtab.c

SELinux: nlmsgtab.c whitespace, syntax, and static declaraction cleanups

2008-04-21 19:05:07 +10:00

selinuxfs.c

SELinux: more user friendly unknown handling printk

2008-07-14 15:02:00 +10:00

xfrm.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6

2008-04-21 16:01:40 -07:00