linux-uconsole/drivers/input/keyboard
Tao Huang 3430c68a33 Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git
* linux-linaro-lsk-v4.4-android: (660 commits)
  ANDROID: keychord: Check for write data size
  ANDROID: sdcardfs: Set num in extension_details during make_item
  ANDROID: sdcardfs: Hold i_mutex for i_size_write
  BACKPORT, FROMGIT: crypto: speck - add test vectors for Speck64-XTS
  BACKPORT, FROMGIT: crypto: speck - add test vectors for Speck128-XTS
  BACKPORT, FROMGIT: crypto: arm/speck - add NEON-accelerated implementation of Speck-XTS
  FROMGIT: crypto: speck - export common helpers
  BACKPORT, FROMGIT: crypto: speck - add support for the Speck block cipher
  UPSTREAM: ANDROID: binder: synchronize_rcu() when using POLLFREE.
  f2fs: updates on v4.16-rc1
  BACKPORT: tee: shm: Potential NULL dereference calling tee_shm_register()
  BACKPORT: tee: shm: don't put_page on null shm->pages
  BACKPORT: tee: shm: make function __tee_shm_alloc static
  BACKPORT: tee: optee: check type of registered shared memory
  BACKPORT: tee: add start argument to shm_register callback
  BACKPORT: tee: optee: fix header dependencies
  BACKPORT: tee: shm: inline tee_shm_get_id()
  BACKPORT: tee: use reference counting for tee_context
  BACKPORT: tee: optee: enable dynamic SHM support
  BACKPORT: tee: optee: add optee-specific shared pool implementation
  ...

Conflicts:
	drivers/irqchip/Kconfig
	drivers/media/i2c/tc35874x.c
	drivers/media/v4l2-core/v4l2-compat-ioctl32.c
	drivers/usb/gadget/function/f_fs.c
	fs/f2fs/node.c

Change-Id: Icecd73a515821b536fa3d81ea91b63d9b3699916
2018-03-09 19:10:14 +08:00
..
adc-keys.c UPSTREAM: Input: add ADC resistor ladder driver 2017-01-13 19:41:22 +08:00
adp5520-keys.c
adp5588-keys.c
adp5589-keys.c
amikbd.c
atakbd.c
atkbd.c
bcm-keypad.c
bf54x-keys.c
cap11xx.c
clps711x-keypad.c
cros_ec_keyb.c
davinci_keyscan.c
ep93xx_keypad.c
goldfish_events.c ANDROID: goldfish_events: no extra EV_SYN; register goldfish 2016-12-01 15:18:44 +05:30
gpio_keys.c
gpio_keys_polled.c
hil_kbd.c
hilkbd.c
hpps2atkbd.h
imx_keypad.c
ipaq-micro-keys.c
jornada680_kbd.c
jornada720_kbd.c
Kconfig UPSTREAM: Input: add ADC resistor ladder driver 2017-01-13 19:41:22 +08:00
lkkbd.c
lm8323.c
lm8333.c
locomokbd.c
lpc32xx-keys.c
Makefile UPSTREAM: Input: add ADC resistor ladder driver 2017-01-13 19:41:22 +08:00
maple_keyb.c
matrix_keypad.c
max7359_keypad.c
mcs_touchkey.c
mpr121_touchkey.c Input: mpr121 - set missing event capability 2017-11-15 17:13:10 +01:00
newtonkbd.c
nomadik-ske-keypad.c
nspire-keypad.c
omap-keypad.c
omap4-keypad.c
opencores-kbd.c
pmic8xxx-keypad.c
pxa27x_keypad.c
pxa930_rotary.c
qt1070.c
qt2160.c
rk_keys.c input: keyboard: rk_keys: add rk_keys.h 2016-12-22 15:31:12 +08:00
samsung-keypad.c
sh_keysc.c
snvs_pwrkey.c
spear-keyboard.c
st-keyscan.c
stmpe-keypad.c
stowaway.c
sun4i-lradc-keys.c
sunkbd.c
synaptics_so340010.c rk: add SPDX license identifier to files with no license 2018-01-31 20:56:06 +08:00
tc3589x-keypad.c
tca6416-keypad.c
tca8418_keypad.c Input: tca8418_keypad - hide gcc-4.9 -Wmaybe-uninitialized warning 2018-02-25 11:03:49 +01:00
tegra-kbc.c
twl4030_keypad.c
w90p910_keypad.c
wm831x_gpio_keys.c
xtkbd.c