Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:
 "Just a small update to xpad driver to recognize yet another gamepad,
  and another change making sure userio.h is exported"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: xpad - add support for Razer Wildcat gamepad
  uapi: add missing install of userio.h

diff --combined include/uapi/linux/Kbuild
index dd9820b1c7796b87986443124ad18907b8b719c3,b4a9a1891db6c1ac432b4dd67c5f2db9b35480e0..f8d9fed17ba99418d858ceb57a864b31a00d078a
--- 1/include/uapi/linux/Kbuild
--- 2/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@@ -64,7 -64,6 +64,7 @@@ header-y += auto_fs.
  header-y += auxvec.h
  header-y += ax25.h
  header-y += b1lli.h
 +header-y += batman_adv.h
  header-y += baycom.h
  header-y += bcm933xx_hcs.h
  header-y += bfs_fs.h
@@@ -110,7 -109,6 +110,7 @@@ header-y += dlm_netlink.
  header-y += dlm_plock.h
  header-y += dm-ioctl.h
  header-y += dm-log-userspace.h
 +header-y += dma-buf.h
  header-y += dn.h
  header-y += dqblk_xfs.h
  header-y += edd.h
@@@ -196,7 -194,6 +196,7 @@@ header-y += if_tun.
  header-y += if_tunnel.h
  header-y += if_vlan.h
  header-y += if_x25.h
 +header-y += ife.h
  header-y += igmp.h
  header-y += ila.h
  header-y += in6.h
@@@ -308,7 -305,6 +308,7 @@@ header-y += netrom.
  header-y += net_namespace.h
  header-y += net_tstamp.h
  header-y += nfc.h
 +header-y += psample.h
  header-y += nfs2.h
  header-y += nfs3.h
  header-y += nfs4.h
@@@ -383,10 -379,6 +383,10 @@@ header-y += sctp.
  header-y += sdla.h
  header-y += seccomp.h
  header-y += securebits.h
 +header-y += seg6_genl.h
 +header-y += seg6.h
 +header-y += seg6_hmac.h
 +header-y += seg6_iptunnel.h
  header-y += selinux_netlink.h
  header-y += sem.h
  header-y += serial_core.h
@@@ -445,6 -437,7 +445,7 @@@ header-y += unistd.
  header-y += unix_diag.h
  header-y += usbdevice_fs.h
  header-y += usbip.h
+ header-y += userio.h
  header-y += utime.h
  header-y += utsname.h
  header-y += uuid.h
@@@ -466,7 -459,6 +467,7 @@@ header-y += virtio_console.
  header-y += virtio_gpu.h
  header-y += virtio_ids.h
  header-y += virtio_input.h
 +header-y += virtio_mmio.h
  header-y += virtio_net.h
  header-y += virtio_pci.h
  header-y += virtio_ring.h