diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 23:28:20 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 23:28:20 +0200 |
commit | cd816a0d84377c4e87f55cbe934a23417f9f5743 (patch) | |
tree | 8834341f81dc570f9f255af57ac28041c317226a /arch/powerpc/include/asm/machdep.h | |
parent | Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux (diff) | |
parent | SELINUX: Fix build error. (diff) | |
download | linux-cd816a0d84377c4e87f55cbe934a23417f9f5743.tar.xz linux-cd816a0d84377c4e87f55cbe934a23417f9f5743.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
SELINUX: Fix build error.
Diffstat (limited to 'arch/powerpc/include/asm/machdep.h')
0 files changed, 0 insertions, 0 deletions