summaryrefslogtreecommitdiffstats
path: root/security/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-17 22:39:52 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-17 22:39:52 +0200
commitdf4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb (patch)
tree109f3c3379e55948e4dea344a4d0ea59bd321f9d /security/Kconfig
parentMerge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff)
parentMIPS: Fix HPAGE_SIZE redefinition (diff)
downloadlinux-df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb.tar.xz
linux-df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb.zip
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: MIPS: Fix HPAGE_SIZE redefinition
Diffstat (limited to 'security/Kconfig')
0 files changed, 0 insertions, 0 deletions