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

Author: Ralf Baechle <[email protected]> Mon Dec 19 12:21:13 2016 +0100
Commit: 0a88e7ace6dbad62cbee74f4355c939b76a56c55
Gitweb: https://git.linux-mips.org/g/ralf/linux/0a88e7ace6db
Branch: linux-3.12-stable

---

 Makefile                                    |    2 -
 arch/sparc/kernel/signal_32.c               |    4 +-
 arch/sparc/mm/init_64.c                     |   71 ++++++++++++++++++++++++---
 arch/tile/kernel/time.c                     |    4 +-
 arch/x86/kernel/head_32.S                   |    2 -
 arch/x86/kernel/process.c                   |    2 +
 arch/x86/kvm/emulate.c                      |   36 ++++----------
 drivers/gpu/drm/radeon/atombios_crtc.c      |    2 +
 drivers/gpu/drm/radeon/radeon_legacy_crtc.c |    2 +
 drivers/i2c/busses/i2c-at91.c               |   58 +++++++++++++++++++---
 drivers/mtd/mtd_blkdevs.c                   |   10 ++--
 drivers/net/ethernet/marvell/sky2.c         |   13 +++++
 drivers/net/macvtap.c                       |   13 +++--
 drivers/net/tun.c                           |   19 +++----
 drivers/net/virtio_net.c                    |   24 ++++-----
 drivers/net/wireless/mwifiex/cfg80211.c     |   13 +++--
 drivers/pci/access.c                        |   27 ++--------
 drivers/pci/pcie/aer/aer_inject.c           |   14 -----
 drivers/pci/quirks.c                        |   20 +++++++-
 drivers/pwm/sysfs.c                         |    2 +
 drivers/scsi/mpt3sas/mpt3sas_scsih.c        |   14 +++++
 drivers/tty/n_tty.c                         |    2 -
 drivers/tty/tty_audit.c                     |    2 -
 drivers/usb/chipidea/core.c                 |    1 
 drivers/usb/chipidea/udc.c                  |    2 -
 drivers/usb/serial/cp210x.c                 |    1 
 drivers/usb/serial/ftdi_sio.c               |    2 +
 drivers/usb/serial/ftdi_sio_ids.h           |    6 ++
 drivers/usb/storage/transport.c             |    7 ++-
 include/linux/pci.h                         |   14 +++++
 include/linux/tty.h                         |    6 +-
 kernel/panic.c                              |    5 ++
 kernel/rcutree_plugin.h                     |    1 
 lib/mpi/mpi-pow.c                           |    7 ++-
 net/core/sock.c                             |    4 +-
 net/dccp/ipv4.c                             |   12 +++--
 net/ipv4/ip_output.c                        |    3 +
 net/ipv4/ping.c                             |    4 ++
 net/ipv6/ip6_tunnel.c                       |   13 ++++-
 net/ipv6/output_core.c                      |    2 +
 net/l2tp/l2tp_ip.c                          |    5 +-
 net/l2tp/l2tp_ip6.c                         |    5 +-
 net/packet/af_packet.c                      |   18 +++++--
 net/sched/act_pedit.c                       |   24 ++++++++-
 net/wireless/core.h                         |    1 
 net/wireless/scan.c                         |   69 ++++++++++++++++++++++++++
 security/apparmor/domain.c                  |    6 ++
 sound/core/pcm_lib.c                        |    2 -
 48 files changed, 414 insertions(+), 162 deletions(-)