original_kernel/net/netlabel
David S. Miller eb14f01959 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/e1000e/ich8lan.c
2008-12-15 20:03:50 -08:00
..
Kconfig
Makefile
netlabel_addrlist.c net: replace NIPQUAD() in net/*/ 2008-10-31 00:54:56 -07:00
netlabel_addrlist.h netlabel: Fix compilation warnings in net/netlabel/netlabel_addrlist.c 2008-10-30 10:44:48 -04:00
netlabel_cipso_v4.c netlabel: Add configuration support for local labeling 2008-10-10 10:16:34 -04:00
netlabel_cipso_v4.h netlabel: Add configuration support for local labeling 2008-10-10 10:16:34 -04:00
netlabel_domainhash.c
netlabel_domainhash.h
netlabel_kapi.c netlabel: Add configuration support for local labeling 2008-10-10 10:16:34 -04:00
netlabel_mgmt.c net: remove redundant argument comments 2008-11-21 17:15:03 -08:00
netlabel_mgmt.h
netlabel_unlabeled.c netlabel: Compiler warning and NULL pointer dereference fix 2008-12-11 21:31:50 -08:00
netlabel_unlabeled.h
netlabel_user.c
netlabel_user.h