linux-uconsole/drivers/nfc
Tao Huang 6bedca442a Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git
* linux-linaro-lsk-v4.4-android: (546 commits)
  Linux 4.4.93
  x86/alternatives: Fix alt_max_short macro to really be a max()
  USB: serial: console: fix use-after-free after failed setup
  USB: serial: qcserial: add Dell DW5818, DW5819
  USB: serial: option: add support for TP-Link LTE module
  USB: serial: cp210x: add support for ELV TFD500
  USB: serial: ftdi_sio: add id for Cypress WICED dev board
  fix unbalanced page refcounting in bio_map_user_iov
  direct-io: Prevent NULL pointer access in submit_page_section
  usb: gadget: composite: Fix use-after-free in usb_composite_overwrite_options
  ALSA: line6: Fix leftover URB at error-path during probe
  ALSA: caiaq: Fix stray URB at probe error path
  ALSA: seq: Fix copy_from_user() call inside lock
  ALSA: seq: Fix use-after-free at creating a port
  ALSA: usb-audio: Kill stray URB at exiting
  iommu/amd: Finish TLB flush in amd_iommu_unmap()
  usb: renesas_usbhs: Fix DMAC sequence for receiving zero-length packet
  KVM: nVMX: fix guest CR4 loading when emulating L2 to L1 exit
  crypto: shash - Fix zero-length shash ahash digest crash
  HID: usbhid: fix out-of-bounds bug
  ...

Conflicts:
	drivers/cpufreq/cpufreq-dt.c
	drivers/usb/dwc3/gadget.c

Change-Id: I1a24ad0bba307b56b5ddf1fd7c4832ffb73ad12f
2017-11-02 17:00:07 +08:00
..
fdp ANDROID: nfc: fdp: Fix possible buffer overflow in WCS4000 NFC driver 2017-09-18 21:14:30 +01:00
microread rk: revert to v3.10 2015-11-11 15:57:28 +08:00
nfcmrvl NFC: nfcmrvl: fix firmware-management initialisation 2017-07-27 15:06:03 -07:00
nxp-nci
pn544 char/misc drivers for 4.4-rc1 2015-11-04 22:15:15 -08:00
s3fwrn5
st-nci spi: Updates for v4.4 2015-11-05 13:15:12 -08:00
st21nfca ANDROID: NFC: st21nfca: Fix memory OOB and leak issues in connectivity events handler 2017-09-18 21:14:31 +01:00
bcm2079x-i2c.c
Kconfig rk: temp revert rk change 2015-11-11 15:54:30 +08:00
Makefile rk: temp revert rk change 2015-11-11 15:54:30 +08:00
mei_phy.c mei: bus: fix received data size check in NFC fixup 2016-11-18 10:48:36 +01:00
mei_phy.h
nfcsim.c NFC: netlink: Add mode parameter to deactivate_target functions 2015-10-27 03:55:12 +01:00
nfcwilink.c
pn533.c NFC: netlink: Add mode parameter to deactivate_target functions 2015-10-27 03:55:12 +01:00
port100.c
trf7970a.c spi: Updates for v4.4 2015-11-05 13:15:12 -08:00