diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-08 22:21:26 -0600 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-10-08 22:21:26 -0600 |
| commit | caa52d9dfbaff23cf6f2de946b24bdbfca9eb982 (patch) | |
| tree | 5f7148a53d2c02edf2ec6f4793367d9919c95a06 /include/linux | |
| parent | 921ae0bdfcefd0427ca50cb90b77fde5ef82733d (diff) | |
| parent | 5f659ecb42b62048f181a3c37fa0eed49e755789 (diff) | |
Promotion of kernel.lnx.4.4-161008.1.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1075178 If8212618baa7533b008228a71740acf1d6c72a52 qpnp: revid: Add support to read FAB ID for PMICOBALT
1073633 I503561677271c39894b7a6910fe8d9c5c25e9c28 msm: sde: Reject 0 size image for SDE rotator
985469 I354e1f7635c5163516e256ed71b8510d1665877d power: reset: Skip emmc_dload sysfs entry creation
1073647 Iec9d3a3b468ddf6607e4a942bb3cf9133e9f0c34 icnss: Provide API to check QMI support
968443 I5a64107e2bf210f82d94ab03c4f86f27f9a330c8 power: reset: Disable SDI when dload mode is not support
1065475 Icf2af8ddac3925fe02b2c8b7b8767a2141922203 uapi: sound: add new ready packet type
1073854 Id0f8634641fa2be12ffe00ddbc96a9e400e40739 icnss: Wait uninterruptible for unregister driver
1067179 I2053eb292051514fa9965e6dc0420e790165ed0d soc:qcom: common_log: change PMIC dump size from 4k to 6
1053780 I29930120a72a08533c859002f646af93e67c754f msm: kgsl: Get GPU snapshot if wait for global timestamp
1054921 I4151b6bfb24e55c1f1a38bfdca012f7b7af86603 msm: vidc: Selectively handle SYS_ERROR as FATAL
1051893 I1150ccaa722109f3ea6a4a10e026709d3686e28b smb-lib: report not charging when battery is missing
1050504 I06262fe271ab6ba81d4fa5f67315fd1b54edee8c ARM: dts: msm: Add and update the dummy clocks for MSMfa
1075209 I8ac486fcb10e823671a8e8b438b7fc76a8969b7c qpnp-smb2: do not configure BATT_OV to end charging cycl
1072607 I753b40d574a4afc2104a5c2bfe64b4831fbce8a0 clk: qcom: Add support for GPU clocks for MSMFalcon
1073854 I6c7ae3b6e52529b14075fb2212bc2c5f76ae5730 icnss: Prevent suspend while processing events
1075207 If2bd750af412adf1eea7b913caed9a3eb3b763db qpnp-smb2: smb-lib: add charge_done property
710614 Ie0265364fefc93d4c1a9044c60adc74758650593 msm: rpm-smd-debug: Remove unwanted pr_info
1072855 I1f769f9ff5a0bab594593c3deaec264a9060c28f clk: msm: clock-osm: Update OSM timers and enable PLL dr
1075178 I66463cf3fa7b0fdeba4cb5ee1e34d27b5e736cfb ARM: dts: msm: Add support to read FAB ID for PMICOBALT
1066464 I86d414bca17464d1dff3346ec668d8b3efec1652 usb: host: Flush hub workqueue before stopping controlle
1073853 I3daf3722cfbdfff080161f9a0248fd8096550328 msm: kgsl: Disable UCHE global filter
985469 If38135427304316b03d3193ad16d335605e9c143 power: reset: Add support for EMMC dload
954740 I14e2d13792ef535364a082cdaed0b79c262ecfe5 power: reset: Disable SDI when dload mode is disabled
Change-Id: I8f901724ce5f9d45f237b9c403d5bbd29e2b1834
CRs-Fixed: 1051893, 1073853, 1050504, 710614, 1073854, 1073633, 1073647, 1065475, 985469, 1053780, 1067179, 968443, 1072855, 1075178, 1075207, 1075209, 1066464, 1054921, 1072607, 954740
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/qpnp/qpnp-revid.h | 1 | ||||
| -rw-r--r-- | include/linux/usb/hcd.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/qpnp/qpnp-revid.h b/include/linux/qpnp/qpnp-revid.h index b13ebe50c3d6..7c12823894df 100644 --- a/include/linux/qpnp/qpnp-revid.h +++ b/include/linux/qpnp/qpnp-revid.h @@ -212,6 +212,7 @@ struct pmic_revid_data { u8 pmic_type; u8 pmic_subtype; const char *pmic_name; + int fab_id; }; #ifdef CONFIG_QPNP_REVID diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h index 3740366d9fc5..cef429cf3dce 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -502,7 +502,7 @@ extern void usb_hc_died(struct usb_hcd *hcd); extern void usb_hcd_poll_rh_status(struct usb_hcd *hcd); extern void usb_wakeup_notification(struct usb_device *hdev, unsigned int portnum); - +extern void usb_flush_hub_wq(void); extern void usb_hcd_start_port_resume(struct usb_bus *bus, int portnum); extern void usb_hcd_end_port_resume(struct usb_bus *bus, int portnum); |