d2: spice up the pulse

Change-Id: I48c21cd52233d217d8494523a3fe6a248591d71d
board-mms-tsp: fix derped ifdefs

Change-Id: I4863620a8c6f3ed6945c31f77bec2dcc18bfdbc2
Apexq: import touchscreen driver change from d2 ML1

Change-Id: I5e613ebb2b0b12d3d642495981a5c65b979bfdcd
match modem watchdog timeout to stock ML1 kernel

stop ajrty33 from whining

Change-Id: I44956574ed2eb324b53fba954bb2ba754a540c2e
Bump nom voltage for MSM8260A

Change-Id: Id391b7cfea6dec445b76476b38187e7a20aa4986
Merge changes Id391b7cf,I44956574,I5e613ebb into cm-11.0

* changes:
  Bump nom voltage for MSM8260A
  match modem watchdog timeout to stock ML1 kernel
  Apexq: import touchscreen driver change from d2 ML1
Merge "d2: spice up the pulse" into cm-11.0
remove Bayer sensor

We don't need it and this choice group just generates compile warnings

stop invisiblek from whining

Change-Id: I2ab82a65a95a9bfc812447ac9899f565f6e22f99
Merge "remove Bayer sensor" into cm-11.0
Revert "usb: hsic: suspend hsic until really activated by the gadget driver"

This reverts commit d9dfd2d18dd0ce61907238f6361f328263ae2680.

Change-Id: I4f38c8291070ab2fb245ce33ca3638d54cf900e3
Revert "HACK: usb: gadget: Fix enumeration on boot"

This reverts commit cf1f4f65649f0048deaf8ebf45d29fea983442bb.

Change-Id: I12578dd0f0b20d7da3f8009987380c90fd13da12
Merge "Revert "HACK: usb: gadget: Fix enumeration on boot"" into cm-11.0
Merge "Revert "usb: hsic: suspend hsic until really activated by the gadget driver"" into cm-11.0
disable CONFIG_SECURITY_SELINUX_DEVELOP

Change-Id: I128d7f449505356a5ce339eef93ecc406aa4bbcf
d2: pulse the led

Change-Id: Ie05b1d6048d5eb1484689d46de3d1262256d8b55
Merge "disable CONFIG_SECURITY_SELINUX_DEVELOP" into cm-11.0
mmc: core: do not reinsert prepeared FUA and FLUSH requests in stop flow

When mmc context has unblocked from waiting current request because of
urgent request notification coming from block layer, there is prepeared
request.  In the case, when the request is REQ_FUA or REQ_FLUSH, the
flow should not reinsert it back to i/o scheduler (since according to
block layer logic flush requests with data should never enter elevator).
Instead this request starts immediately.

Change-Id: Ia78b56c6135dd1a8d75a98fd5b771a5035e5c360
Signed-off-by: Konstantin Dorfman <kdorfman@codeaurora.org>
clocksource: Add new feature flag CLOCK_SOURCE_SUSPEND_NONSTOP

Some x86 processors have a TSC clocksource, which continues to run
even when system is suspended. Also most OMAP platforms have a
32 KHz timer which has similar capability. Add a feature flag so that
it could be utilized.

CRs-fixed: 536881
Change-Id: I863678fec5a3021158240f2c5b144c552ba0b16a
Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Git-commit: 5caf4636259ae3af0efbb9bfc4cd97874b547c7d
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
timekeeping: utilize the suspend-nonstop clocksource to count suspended time

There are some new processors whose TSC clocksource won't stop during
suspend. Currently, after system resumes, kernel will use persistent
clock or RTC to compensate the sleep time, but with these nonstop
clocksources, we could skip the special compensation from external
sources, and just use current clocksource for time recounting.

This can solve some time drift bugs caused by some not-so-accurate or
error-prone RTC devices.

The current way to count suspended time is first try to use the persistent
clock, and then try the RTC if persistent clock can't be used. This
patch will change the trying order to:
	suspend-nonstop clocksource -> persistent clock -> RTC

When counting the sleep time with nonstop clocksource, use an accurate way
suggested by Jason Gunthorpe to cover very large delta cycles.

CRs-fixed: 536881
Change-Id: I59c21b1ce5ae81cebc8cf3e817d9b3f951302a3d
Signed-off-by: Feng Tang <feng.tang@intel.com>
[jstultz: Small optimization, avoiding re-reading the clocksource]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Git-commit: e445cf1c4257cc0238d72e4129eb4739f46fd3de)
[sboyd: Took tk and clock local variables]
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
tick: Dynamically set broadcast irq affinity

When a cpu goes to a deep idle state where its local timer is
shutdown, it notifies the time frame work to use the broadcast timer
instead.  Unfortunately, the broadcast device could wake up any CPU,
including an idle one which is not concerned by the wake up at all. So
in the worst case an idle CPU will wake up to send an IPI to the CPU
whose timer expired.

Provide an opt-in feature CLOCK_EVT_FEAT_DYNIRQ which tells the core
that is should set the interrupt affinity of the broadcast interrupt
to the cpu which has the earliest expiry time. This avoids unnecessary
spurious wakeups and IPIs.

[ tglx: Adopted to cpumask rework, silenced an uninitialized warning,
  massaged changelog ]

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: viresh.kumar@linaro.org
Cc: jacob.jun.pan@linux.intel.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: santosh.shilimkar@ti.com
Cc: linaro-kernel@lists.linaro.org
Cc: patches@linaro.org
Cc: rickard.andersson@stericsson.com
Cc: vincent.guittot@linaro.org
Cc: linus.walleij@stericsson.com
Cc: john.stultz@linaro.org
Link: http://lkml.kernel.org/r/1362219013-18173-3-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Change-Id: I6a880a39dd595526b80a6d72b88be74163513da9
Signed-off-by: Karthik Parsha <kparsha@codeaurora.org>
Signed-off-by: Mahesh Sivasubramanian <msivasub@codeaurora.org>