linux/include/uapi
Tao Huang 04026c23c8 Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git
* linux-linaro-lsk-v4.4-android: (812 commits)
  Linux 4.4.167
  mac80211: ignore NullFunc frames in the duplicate detection
  mac80211: fix reordering of buffered broadcast packets
  mac80211: ignore tx status for PS stations in ieee80211_tx_status_ext
  mac80211: Clear beacon_int in ieee80211_do_stop
  mac80211_hwsim: Timer should be initialized before device registered
  kgdboc: fix KASAN global-out-of-bounds bug in param_set_kgdboc_var()
  tty: serial: 8250_mtk: always resume the device in probe.
  cifs: Fix separator when building path from dentry
  Staging: lustre: remove two build warnings
  xhci: Prevent U1/U2 link pm states if exit latency is too long
  SUNRPC: Fix leak of krb5p encode pages
  virtio/s390: fix race in ccw_io_helper()
  virtio/s390: avoid race on vcdev->config
  ALSA: pcm: Fix interval evaluation with openmin/max
  ALSA: pcm: Call snd_pcm_unlink() conditionally at closing
  ALSA: pcm: Fix starvation on down_write_nonblock()
  ALSA: hda: Add support for AMD Stoney Ridge
  ALSA: usb-audio: Fix UAF decrement if card has no live interfaces in card.c
  USB: check usb_get_extra_descriptor for proper size
  ...

Conflicts:
	drivers/gpu/drm/rockchip/rockchip_drm_drv.c
	drivers/usb/host/xhci-ring.c

Change-Id: I4304b0875908403a7d88a0d77da52cea04563c11
2018-12-19 18:46:58 +08:00
..
asm-generic rk: revert to v3.10 2015-11-11 15:57:28 +08:00
drm BACKPORT: drm: Add an encoder and connector type enum for DPI. 2018-11-26 21:16:13 +08:00
linux Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git 2018-12-19 18:46:58 +08:00
misc soc: rockchip: fix flash vendor structure error 2018-07-10 16:38:48 +08:00
mtd mtd: mtd-user: remove stdint.h include 2015-10-19 18:19:06 -07:00
rdma Initial 4.4 merge window submission 2015-11-07 13:33:07 -08:00
scsi cxlflash: Fix to avoid virtual LUN failover failure 2016-09-15 08:27:49 +02:00
sound rk: revert to v3.10 2015-11-11 15:57:28 +08:00
video video: rockchip: vpu: fix set power idle failed 2017-12-27 15:47:31 +08:00
xen xen/gntdev: use types from linux/types.h in userspace headers 2015-10-23 14:20:45 +01:00
Kbuild