diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-10 04:42:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-10 04:42:04 +0100 |
| commit | 394e849b83463869e2267ea7acea002366e6fefc (patch) | |
| tree | 917ec5c564964d781ffbda2917efdf7cde252c72 /arch/mips/kernel/scall64-64.S | |
| parent | serial: pl011: Add device tree support for RX DMA polling (diff) | |
| parent | Linux 3.18-rc4 (diff) | |
| download | linux-394e849b83463869e2267ea7acea002366e6fefc.tar.xz linux-394e849b83463869e2267ea7acea002366e6fefc.zip | |
Merge 3.18-rc4 into tty-next.
This resolves a merge issue with drivers/tty/serial/8250/8250_mtk.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/kernel/scall64-64.S')
| -rw-r--r-- | arch/mips/kernel/scall64-64.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index 002b1bc09c38..5251565e344b 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S @@ -434,4 +434,5 @@ EXPORT(sys_call_table) PTR sys_seccomp PTR sys_getrandom PTR sys_memfd_create + PTR sys_bpf /* 5315 */ .size sys_call_table,.-sys_call_table |