Merge tag 'v3.18.81' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.18-stable

Author: Ralf Baechle <[email protected]> Thu Dec 21 14:25:39 2017 +0100
Commit: 990ef28a0716ce77e27116cf618f66af0f37c757
Gitweb: https://git.linux-mips.org/g/ralf/linux/990ef28a0716
Branch: linux-3.18-stable

---

 Documentation/devicetree/bindings/arm/davinci.txt  |    4 +
 .../devicetree/bindings/vendor-prefixes.txt        |    1 
 Makefile                                           |    2 -
 arch/arm/boot/dts/imx53-qsb-common.dtsi            |   20 +++---
 arch/arm/configs/omap2plus_defconfig               |    1 
 arch/arm/kernel/traps.c                            |   28 +++++---
 arch/mips/ar7/platform.c                           |    1 
 arch/mips/include/asm/mips-cm.h                    |    4 +
 arch/mips/mm/uasm-micromips.c                      |    2 -
 arch/sh/kernel/cpu/sh3/setup-sh770x.c              |    1 
 arch/x86/crypto/sha-mb/sha1_mb_mgr_flush_avx2.S    |   12 ++-
 arch/x86/oprofile/op_model_ppro.c                  |    4 +
 drivers/block/rbd.c                                |    4 +
 drivers/gpu/drm/drm_drv.c                          |    2 -
 drivers/iio/trigger/iio-trig-interrupt.c           |    8 +-
 drivers/iio/trigger/iio-trig-sysfs.c               |    2 -
 drivers/infiniband/ulp/ipoib/ipoib_cm.c            |    2 -
 drivers/input/keyboard/mpr121_touchkey.c           |   24 ++++---
 drivers/net/can/c_can/c_can_pci.c                  |    1 
 drivers/net/can/c_can/c_can_platform.c             |    1 
 drivers/net/xen-netback/netback.c                  |    6 +-
 drivers/staging/iio/trigger/iio-trig-bfin-timer.c  |    4 +
 drivers/tty/serial/sh-sci.c                        |   17 ++---
 drivers/usb/core/hcd.c                             |    1 
 drivers/video/fbdev/pmag-ba-fb.c                   |    2 -
 include/linux/phy.h                                |    8 +-
 include/sound/seq_kernel.h                         |    3 +
 lib/asn1_decoder.c                                 |    4 +
 net/ipv4/ah4.c                                     |    3 +
 security/keys/trusted.c                            |   70 +++++++++-----------
 sound/core/seq/oss/seq_oss_midi.c                  |    4 -
 sound/core/seq/oss/seq_oss_readq.c                 |   29 ++++++++
 sound/core/seq/oss/seq_oss_readq.h                 |    2 +
 33 files changed, 161 insertions(+), 116 deletions(-)