Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.01.007.025 on remote branch"
expressatt: disable CONFIG_MSM_STANDALONE_POWER_COLLAPSE

Change-Id: I2c7f605d64bccb926f87848cf0a714728419c35a
cypress-touchkey: tweak BLN implementation

- don't call enable_irq unless we're actually resuming, there's
  no need have it enabled just to illuminate the touchkeys.

Change-Id: I591150d51b1ab98041fa50c9bdccbeccb876bc26
Merge "Merge "msm: msm_fb: Update panel info in case of resolution change. In case of resolution change, panel_info and mfd are updated with latest resolution.""
Merge "Merge "Merge "msm: msm_fb: Update panel info in case of resolution change. In case of resolution change, panel_info and mfd are updated with latest resolution."""
Merge "Merge "msm: msm_fb: Update panel info in case of resolution change. In case of resolution change, panel_info and mfd are updated with latest resolution.""
Merge "cfg80211: fix set_regdom() to cancel requests with same alpha2"
Merge "msm: wlan: Add VHT80 support on db.txt"
Merge "msm: wlan: update  db.txt with information from compliance team"
Merge "cfg80211: export regulatory_hint_user() API"
Merge "Merge "Merge "msm: msm_fb: Update panel info in case of resolution change. In case of resolution change, panel_info and mfd are updated with latest resolution."""
Merge "Merge "msm: msm_fb: Update panel info in case of resolution change. In case of resolution change, panel_info and mfd are updated with latest resolution.""
Merge "cfg80211: permanently disable channels specified by base settings"
Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.026 on remote branch

Change-Id: I8a89c27071c00f2fd415e9411517607482edfc36
Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.026 on remote branch"
Merge "Merge "Merge "msm: msm_fb: Update panel info in case of resolution change. In case of resolution change, panel_info and mfd are updated with latest resolution."""
Merge "Merge "cfg80211: permanently disable channels specified by base settings""
Merge "Merge "Merge "cfg80211: permanently disable channels specified by base settings"""
arm: if there's no handler we need to restore sigmask, syscall or no syscall

CRs-fixed: 592079
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Git-commit: 7dfae72027cd8345247e675a3b27439df95fe06e
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-stable.git
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>
arm: new way of handling ERESTART_RESTARTBLOCK

new "syscall start" flag; handled in syscall_trace() by switching
syscall number to that of syscall_restart(2).  Restarts of that
kind (ERESTART_RESTARTBLOCK) are handled by setting that bit;
syscall number is not modified until the actual call.

CRs-fixed: 592079
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Git-commit: 6b5c8045ecc7e726cdaa2a9d9c8e5008050e1252
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-stable.git
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>