黄涛 7fe47454f2 lsk-android 14.04 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJTWERtAAoJELSic+t+oim9JWYP/0QCExvsT5PIzWueVqblD8Kz QlJ/fnFd5xHlVUtF7EJJHlJP6psANlF3ol7UJSofS+V7DFKKU460c5qEqC6XpuXD 9JdAByrHBfxhOolg0BCSTqSEM7KoZE6LDuEN+ZcDvR5mplHOfTPdtQIjNt2ZQ1A4 IToz1gAc8yZLzsBSBY7lijLZ3cZAXG3EFwi6imHgdBn2YfK2W/A4qjVTOSdV/ntq ISSHDN30EI0dcJJP74pzP5c7S5M9liMDVaEwvzs9+8jYO7TkMqsUz37d2d1u91av HyXKMjp07dO4Ym0/iaONv44c3tmVfHrnJDTLZHU2V142KPgpmoplbvouqb9i6DmM Euv20a5f8IridDPsIYk1nfmMOP42DVeND2YGgdUFOvSMThE2S5dfhOSgxHeHqXms LKXC9ocYYugzDi8rwSCr85K/3rTueR9GUL5730W5ObEq/A8MladQSxtqybroE3uP VctJOlrLU2mxfzYU99pybU9CmUz5aZRQP0IUVUgRwK+NxpLhYevhbc22oOR8F/Fu qJ9sqNDohHWKH8MCN1NVfsad1CmefQbl5STffQuu1GpRx7elV+/Ri39P6J/0m1UI rNbTpGxhHD+0nEMCuxqMS/sknV/vIz4ht9WCAUTcLyUIaFiuihzWnaVo2n3//nDp hwg7gOS0O3m0VWxhSh9U =+kRa -----END PGP SIGNATURE----- Merge tag 'lsk-android-14.04' into develop-3.10 lsk-android 14.04 Conflicts: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt drivers/pinctrl/pinconf-generic.c include/linux/pinctrl/consumer.h include/linux/pinctrl/pinconf-generic.h		2014-04-24 19:04:10 +08:00
..
android_composite.h
association.h
atmel_usba_udc.h
audio-v2.h
audio.h
c67x00.h
cdc-wdm.h
cdc_ncm.h
ch9.h	rk: revert 20f3d0b+v3.0.66 to v3.0	2013-11-08 21:34:05 +08:00
chipidea.h
composite.h	rk: revert 20f3d0b+v3.0.66 to v3.0	2013-11-08 21:34:05 +08:00
dwc3-omap.h
ehci_def.h
ehci_pdriver.h
ezusb.h
f_accessory.h	rk: revert 20f3d0b+v3.0.66 to v3.0	2013-11-08 21:34:05 +08:00
f_mtp.h	rk: revert 20f3d0b+v3.0.66 to v3.0	2013-11-08 21:34:05 +08:00
functionfs.h
g_hid.h
gadget.h
gadget_configfs.h
gpio_vbus.h
hcd.h	rk: revert 20f3d0b+v3.0.66 to v3.0	2013-11-08 21:34:05 +08:00
input.h
intel_mid_otg.h
iowarrior.h
irda.h
isp116x.h
isp1301.h
isp1362.h
isp1760.h
m66592.h
msm_hsusb.h
msm_hsusb_hw.h
musb-omap.h
musb-ux500.h
musb.h
net2280.h
nop-usb-xceiv.h
ohci_pdriver.h
omap_control_usb.h
omap_usb.h
otg.h
phy.h
phy_companion.h
quirks.h
r8a66597.h
renesas_usbhs.h
rndis_host.h
samsung_usb_phy.h
serial.h
sl811.h
storage.h
tegra_usb_phy.h
tilegx.h
uas.h
ulpi.h
usbnet.h	usbnet: include wait queue head in device structure	2014-04-14 06:42:18 -07:00
wusb-wa.h
wusb.h