kernel_optimize_test/net/netlabel
David S. Miller 49997d7515 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:

	Documentation/powerpc/booting-without-of.txt
	drivers/atm/Makefile
	drivers/net/fs_enet/fs_enet-main.c
	drivers/pci/pci-acpi.c
	net/8021q/vlan.c
	net/iucv/iucv.c
2008-07-18 02:39:39 -07:00
..
Kconfig [NETLABEL]: Fix build failure. 2006-11-05 16:44:06 -08:00
Makefile [NetLabel]: core NetLabel subsystem 2006-09-22 14:53:34 -07:00
netlabel_cipso_v4.c netlabel: return msg overflow error from netlbl_cipsov4_list faster 2008-07-14 22:28:25 -07:00
netlabel_cipso_v4.h NetLabel: introduce a new kernel configuration API for NetLabel 2008-02-05 09:44:20 -08:00
netlabel_domainhash.c rcu: split list.h and move rcu-protected lists into rculist.h 2008-05-19 10:01:37 +02:00
netlabel_domainhash.h NetLabel: introduce a new kernel configuration API for NetLabel 2008-02-05 09:44:20 -08:00
netlabel_kapi.c NetLabel: introduce a new kernel configuration API for NetLabel 2008-02-05 09:44:20 -08:00
netlabel_mgmt.c netlabel: netlink_unicast calls kfree_skb on error path by itself 2008-07-10 16:53:39 -07:00
netlabel_mgmt.h NetLabel: Remove unneeded RCU read locks 2008-01-30 08:17:16 +11:00
netlabel_unlabeled.c netlabel: netlink_unicast calls kfree_skb on error path by itself 2008-07-10 16:53:39 -07:00
netlabel_unlabeled.h NetLabel: Introduce static network labels for unlabeled connections 2008-01-30 08:17:28 +11:00
netlabel_user.c Audit: collect sessionid in netlink messages 2008-04-28 06:18:03 -04:00
netlabel_user.h Audit: collect sessionid in netlink messages 2008-04-28 06:18:03 -04:00