Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[safe/jmp/linux-2.6] / Documentation / netlabel / cipso_ipv4.txt
2006-09-22 Paul Moore[NetLabel]: documentation