diff options
author | 2010-02-25 07:09:54 -0800 | |
---|---|---|
committer | 2010-02-25 07:09:54 -0800 | |
commit | dbd004291ed31db280a3f2d7a1113a04e5e85af4 (patch) | |
tree | 2527346fca970d3bd7187f3848e0b6cdef933f3e /arch/mips/kernel/mips-mt-fpaff.c | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
parent | netlabel: fix export of SELinux categories > 127 (diff) | |
download | linux-dev-dbd004291ed31db280a3f2d7a1113a04e5e85af4.tar.xz linux-dev-dbd004291ed31db280a3f2d7a1113a04e5e85af4.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:
netlabel: fix export of SELinux categories > 127
Diffstat (limited to 'arch/mips/kernel/mips-mt-fpaff.c')
0 files changed, 0 insertions, 0 deletions