linux-uconsole/include
Huang, Tao f36cb4e3bf extcon: remove EXTCON_PROP_USB_ID property
Fix commit 536277d550 ("FROMLIST: extcon: Add the support for
extcon property according to extcon type"), which introduce
EXTCON_PROP_USB_ID property, but upstream don't have such property.
Remove it make merge easy.

Change-Id: I7905049629aa85158b7e705b40018f83fa85a9ac
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2016-10-07 15:27:44 +08:00
..
acpi
asm-generic LSK 16.07 v4.4-android 2016-08-10 15:15:47 +08:00
clocksource
crypto crypto: af_alg - Allow af_af_alg_release_parent to be called on nokey path 2016-02-17 12:31:03 -08:00
drm LSK 16.07 v4.4-android 2016-08-10 15:15:47 +08:00
dt-bindings clk: rockchip: rk3399: fix up the spi softrst ID 2016-09-29 16:39:02 +08:00
keys
kvm
linux extcon: remove EXTCON_PROP_USB_ID property 2016-10-07 15:27:44 +08:00
math-emu
media camsys_head: 0.0xd.0 2016-09-21 14:20:38 +08:00
memory
misc misc: rockchip-scr: add rockchip SOC smart card reader controller driver. 2016-03-21 11:03:15 +08:00
net Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2016-06-27 12:18:04 +08:00
pcmcia
ras
rdma IB/security: Restrict use of the write() interface 2016-05-04 14:48:48 -07:00
rxrpc
scsi scsi: Add intermediate STARGET_REMOVE state to scsi_target_state 2016-06-01 12:15:54 -07:00
soc video: rockchip: lcdc: add support dmc 2016-08-25 21:22:12 +08:00
sound FROMLIST: ASoC: hdmi-codec: callback function will be called with private data 2016-07-20 10:26:21 +08:00
target target: Fix WRITE_SAME/DISCARD conversion to linux 512b sectors 2016-03-09 15:34:51 -08:00
trace Merge branch 'lsk-v4.4-eas-v5.2' of git://git.linaro.org/arm/eas/kernel.git 2016-06-08 14:09:19 +08:00
uapi drm/rockchip: add plane feature scale and alpha 2016-08-11 16:02:06 +08:00
video LSK 16.06 v4.4-android 2016-07-05 18:36:47 +08:00
xen xen: Fix page <-> pfn conversion on 32 bit systems 2016-05-11 11:21:14 +02:00
Kbuild