diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-08 04:59:07 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-08 04:59:07 +0400 |
| commit | c1a567d31b5488f4593eae7ca215264947b355ca (patch) | |
| tree | 347b8226a2e92676dc2618d8109b99aa275aa31e /arch/mips/include/uapi/asm/inst.h | |
| parent | 14b596c9d80bf63da3f0fcbddfd67eb62197afb4 (diff) | |
| parent | cd3de83f147601356395b57a8673e9c5ff1e59d1 (diff) | |
| download | linux-c1a567d31b5488f4593eae7ca215264947b355ca.tar.xz | |
Merge 3.16-rc4 into staging-next
We want the staging tree fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/include/uapi/asm/inst.h')
| -rw-r--r-- | arch/mips/include/uapi/asm/inst.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/include/uapi/asm/inst.h b/arch/mips/include/uapi/asm/inst.h index 4b7160259292..4bfdb9d4c186 100644 --- a/arch/mips/include/uapi/asm/inst.h +++ b/arch/mips/include/uapi/asm/inst.h @@ -273,6 +273,7 @@ enum mm_32a_minor_op { mm_and_op = 0x250, mm_or32_op = 0x290, mm_xor32_op = 0x310, + mm_slt_op = 0x350, mm_sltu_op = 0x390, }; |