Commit Graph

413414 Commits

Author SHA1 Message Date
Ian Maund 491fb5c232 Merge upstream tag 'v3.10.40' into msm-3.10
* commit 'v3.10.40': (203 commits)
  Linux 3.10.40
  ARC: !PREEMPT: Ensure Return to kernel mode is IRQ safe
  drm: cirrus: add power management support
  Input: synaptics - add min/max quirk for ThinkPad Edge E431
  Input: synaptics - add min/max quirk for ThinkPad T431s, L440, L540, S1 Yoga and X1
  lockd: ensure we tear down any live sockets when socket creation fails during lockd_up
  dm thin: fix dangling bio in process_deferred_bios error path
  dm transaction manager: fix corruption due to non-atomic transaction commit
  Skip intel_crt_init for Dell XPS 8700
  mtd: sm_ftl: heap corruption in sm_create_sysfs_attributes()
  mtd: nuc900_nand: NULL dereference in nuc900_nand_enable()
  mtd: atmel_nand: Disable subpage NAND write when using Atmel PMECC
  tgafb: fix data copying
  gpio: mxs: Allow for recursive enable_irq_wake() call
  rtlwifi: rtl8188ee: initialize packet_beacon
  rtlwifi: rtl8192se: Fix regression due to commit 1bf4bbb
  rtlwifi: rtl8192se: Fix too long disable of IRQs
  rtlwifi: rtl8192cu: Fix too long disable of IRQs
  rtlwifi: rtl8188ee: Fix too long disable of IRQs
  rtlwifi: rtl8723ae: Fix too long disable of IRQs
  ...

Change-Id: If5388cf980cb123e35e1b29275ba288c89c5aa18
Signed-off-by: Ian Maund <imaund@codeaurora.org>
2014-06-18 13:10:54 -07:00
Ian Maund 279c9cefed Revert "scripts/Makefile.headersinst: install headers from scratch file"
This reverts commit 71f613a0a5. Upstream
has corrected the same bug with a different solution. Removing our
implementation to stay in sync with upstream. This is corrected in
upstream commit 3246a0352e.

Change-Id: I06fc01cfe30d3259e7e39d8e863312c3ff3b33e2
Signed-off-by: Ian Maund <imaund@codeaurora.org>
2014-06-17 16:49:47 -07:00
Ian Maund fb7a28497f Revert "scripts/Makefile.headersinst: make scratch file parallel safe"
This reverts commit 69005c760d. This commit
was a bugfix on top of commit 71f613a0a5.
As this commit is also being reverted, we no longer need this bugfix.

Change-Id: I7f9a29d78e1e0ddf25f84c993365fcabdc0880e7
Signed-off-by: Ian Maund <imaund@codeaurora.org>
2014-06-17 16:49:46 -07:00
Linux Build Service Account 02a2c6ee94 Merge "ASoC: wcd: ensure regulator is on during plug detection" 2014-06-16 23:37:07 -07:00
Linux Build Service Account 33880fc49a Merge "mmc: core: Change stop_request() print to debug log level" 2014-06-16 23:36:58 -07:00
Linux Build Service Account 0427eb1f49 Merge "ARM: dts: msm: Configure wakeup byte for HSUART in apq8084" 2014-06-16 23:36:56 -07:00
Naveen Kaje 46f34539ef ARM: dts: msm: Configure wakeup byte for HSUART in apq8084
Fix wakeup byte configs for HS UART used by BT for MTP and CDP.

CRs-Fixed: 660222
Change-Id: I2a674012a9afeba80bce2aaf16826757d83186cb
Signed-off-by: Naveen Kaje <nkaje@codeaurora.org>
2014-06-16 20:37:35 -07:00
Linux Build Service Account f3406196cd Merge "ARM: dts: msm: Reduce modem region to 72MB for msm8916-512" 2014-06-16 18:07:02 -07:00
Linux Build Service Account 1e5a07473d Merge "ASoC: msm: qdsp6v2: Add Primary MI2S support" 2014-06-16 18:06:53 -07:00
Linux Build Service Account 584e9a392e Merge "fs: ubifs: add ubi device index to trace" 2014-06-16 18:06:51 -07:00
Linux Build Service Account 13f5d48f97 Merge "msm_serial_hs: Fix wakeup byte data type and log" 2014-06-16 18:06:49 -07:00
Linux Build Service Account 638630f4e4 Merge "arm: Skip DMA zeroing completely only if specified" 2014-06-16 18:06:44 -07:00
Linux Build Service Account 57983f3d34 Merge "soc: cpu_pwr_ctl: Change the CPU power up sequence for 8994" 2014-06-16 18:06:35 -07:00
Linux Build Service Account c3c7b94bae Merge "QoS: Modify data structures and function arguments for scalability." 2014-06-16 18:06:33 -07:00
Linux Build Service Account 1be226e380 Merge "msm: mdss: Flush Interface timing registers only once" 2014-06-16 18:06:30 -07:00
Linux Build Service Account de63f1def5 Merge "msm: VPU: Add Dual Output Support" 2014-06-16 18:06:28 -07:00
Linux Build Service Account 39ec2349fb Merge "ASoC: msm: qdsp6v2: fix for mutex deadlock in listen driver" 2014-06-16 18:06:25 -07:00
Linux Build Service Account 549b5a98eb Merge "ASoC: core: Add compat ioctl support for listen driver" 2014-06-16 18:06:23 -07:00
Linux Build Service Account 15c844c7d8 Merge "ASoC: wcd9330: Enable Speaker Smart Boost gating" 2014-06-16 18:06:17 -07:00
Linux Build Service Account 2cadc8d29d Merge "msm: kgsl: Make the adreno device attributes generic" 2014-06-16 18:06:12 -07:00
Linux Build Service Account 7e0cc1030b Merge "msm: kgsl: Use an explicit regulator disable for the SP/TP block" 2014-06-16 18:06:11 -07:00
Linux Build Service Account f1b111328b Merge "ASoC: msm: qdsp6v2: Add check for DSP status before using the size" 2014-06-16 18:06:06 -07:00
Linux Build Service Account 3d4529ca72 Merge "msm: kgsl: fix device->mutex recursions" 2014-06-16 18:06:03 -07:00
Linux Build Service Account 9e8beef81d Merge "msm: kgsl: refactor snapshot to remove device->mutex locking" 2014-06-16 18:06:02 -07:00
Linux Build Service Account 00ddd1e8b7 Merge "lpm-levels: Remove hotplug serialization before cluster initialization" 2014-06-16 18:06:00 -07:00
Linux Build Service Account 88bbf512be Merge "ARM: dts: msm8916: Add CDT 1.1 support" 2014-06-16 18:05:55 -07:00
Linux Build Service Account 2ebc7a0816 Merge "msm: lpm-levels: Allow clock gating even when sleep_disabled is set" 2014-06-16 18:05:50 -07:00
Linux Build Service Account e0fd6c307a Merge "defconfig: fsm9900: Add SCTP support" 2014-06-16 15:04:55 -07:00
Linux Build Service Account 03a021696f Merge "ARM: dts: msm: update max macro blocks per sec supported on 8939" 2014-06-16 15:04:53 -07:00
Linux Build Service Account 81a2cc98c3 Merge "usb: android: Fix bug in ECM bind" 2014-06-16 15:04:52 -07:00
Linux Build Service Account 5c4e65d31e Merge "mmc: core: Add retry mechanism for MMC resume failure" 2014-06-16 15:04:47 -07:00
Linux Build Service Account c38e3ef8b1 Merge "ARM: dts: msm: Disable AHB2AHB bypass for msm8939" 2014-06-16 15:04:46 -07:00
Linux Build Service Account cf3afc7d36 Merge "ARM: dts: 8916: Add 1400us delay to allow buck decay time." 2014-06-16 15:04:44 -07:00
Linux Build Service Account 7bac004ca5 Merge "ARM: dts: msm: Add support for 8x16 variants" 2014-06-16 15:04:43 -07:00
Linux Build Service Account a98113ff46 Merge "ARM: dts: Update property node for qcom,vctl-timeout-us" 2014-06-16 15:04:41 -07:00
Linux Build Service Account 8265204336 Merge "ARM: dts: msm: Modify MMNOC QoS settings for msm8994" 2014-06-16 15:04:30 -07:00
Linux Build Service Account 77ed49532c Merge "ARM: dts: msm: Add the initial device tree for msmferrum" 2014-06-16 15:04:27 -07:00
Linux Build Service Account 97c2449574 Merge "ARM: dts: msm8939: Set correct clock plan frequencies for venus" 2014-06-16 15:04:25 -07:00
Linux Build Service Account 0243a57164 Merge "cnss: Set the default state of WLAN_EN GPIO to low" 2014-06-16 15:04:23 -07:00
Naveen Kaje d74b38bb39 msm_serial_hs: Fix wakeup byte data type and log
Wakeup byte should be an unsigned char to match the
definition of tty_insert_flip_string where it is used
and add debug level log for the same.

Change-Id: I6f558d68e7fb99ffaf5c287e703576c2340e5bcb
Signed-off-by: Naveen Kaje <nkaje@codeaurora.org>
2014-06-16 13:41:23 -06:00
Linux Build Service Account beaca7d76d Merge "ax88179_178a: Correct the RX error definition in RX header" 2014-06-16 10:55:32 -07:00
Linux Build Service Account 8be9ad5671 Merge "msm: mdss: Use correct error checking for mdss bus scale register" 2014-06-16 10:55:30 -07:00
Linux Build Service Account af7c8ea265 Merge "ARM: dts: msm: add DT entries to enable continuous splash on 8939" 2014-06-16 10:55:23 -07:00
Linux Build Service Account c779f5dc11 Merge "ARM: DTS: MSM: Correct PHY init parameters for MSM8916" 2014-06-16 10:55:22 -07:00
Linux Build Service Account da33722b8d Merge "defconfig: automatic update" 2014-06-16 10:55:18 -07:00
Linux Build Service Account 2251b2fd94 Merge "ARM: dts: msm: Add UICC mass storage luns for msm8939" 2014-06-16 10:55:17 -07:00
Linux Build Service Account 6f7fcf3ef1 Merge "mdss: fb: ensure that shared memory is available during probe" 2014-06-16 10:55:14 -07:00
Linux Build Service Account a778c76f0b Merge "ARM: dts: msm: Update memory map of msm8939" 2014-06-16 10:55:07 -07:00
Linux Build Service Account d2067b3403 Merge "power: smb1360: Changes to support SMB v2.1" 2014-06-16 10:55:00 -07:00
Linux Build Service Account a0460889fd Merge "msm: camera: Query only AHB clks from dt in ISPIF" 2014-06-16 10:54:48 -07:00