summaryrefslogtreecommitdiffstats
path: root/security/security.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-07-14 23:47:04 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-14 23:47:04 -0700
commitd09f51b6997f3f443c5741bc696651e479576715 (patch)
tree6d5eefcbaa9f46d44e8cad626011e886b5d1840c /security/security.c
parent1b1ac759d7c6bba6e5f4731ef6ea720b6636e27c (diff)
parente559e91cce3af215d78b7262360f19b95978aab3 (diff)
downloadop-kernel-dev-d09f51b6997f3f443c5741bc696651e479576715.zip
op-kernel-dev-d09f51b6997f3f443c5741bc696651e479576715.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
Conflicts: crypto/Kconfig
Diffstat (limited to 'security/security.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud