config: version9c
Merge branch '3.0.68' of github.com:austinay/sweetnsour-kernel into 3.0.68

r SDIO cards,
as configuring of sdio wakeup interrupt is entirely handled
in system suspend/resume callbacks. Handle this by moving all
of the wakeup handling code to generic set_ios function which can be
called either from core layer or driver layer.

Since the SDCC controller supports asynchronous notification of
SDIO card activity when the clocks are off use this for enabling
MMC_CLKGATE feature which helps in TCX0 during idle state.

Also, handle the case where the SDIO function driver is not interested
in waking up the system during suspend but the SDCC driver still
configures DAT1 line as wakeup interrupt.

CRs-Fixed: 346559
Signed-off-by: Sujit Reddy Thumma <sthumma@codeaurora.org>
(cherry picked from commit f4a999cf000da9d53240040f7d63217caaa5f193)

Change-Id: I3257595161b7b20f5065d301a23d3ace8dc6864f
Signed-off-by: Srivalli Oguri <oguri@codeaurora.org>

Conflicts:
	drivers/mmc/host/msm_sdcc.c
Forward port bluetooth drivers from jb_mr1_chocolate (hephappy)
Forward port bluetooth drivers from jb_mr1_chocolate

Change-Id: I0cb97aca72645af7a18ee631cc51b34d8f0e7e26