wireless: bcmdhd: use wlan_mem_prealloc for CUSTOMER_HW_SAMSUNG

-reference bcm4330
defconfig: ics: set TUN to be in-built and BROADCOM_WIFI_RESERVED_MEM
sdio: optimized SDIO IRQ handling for single irq

If there is only 1 function interrupt registered it is possible to
improve performance by directly calling the irq handler
and avoiding the overhead of reading the CCCR registers.

From: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com>

Signed-off-by: Per Forlin <per.forlin@linaro.org>
Acked-by: Ulf Hansson <ulf.hansson@stericsson.com>
Reviewed-by: Nicolas Pitre <nicolas.pitre@linaro.org>
net: backport/sync *ppp* with moto's 2.6.39

-use github.com/kcrudup (ics-2.6.39)
net: backport/sync l2tp with moto's 2.6.39

-use github.com/kcrudup (ics-2.6.39)
defconfig: ics: enable remaining PPP options and L2TP

-reference sbiriguda
 http://goo.gl/5P1lT
atmel_mxt1386: Add new mXT1386 touchscreen driver

Initially taken from the Samsung Galaxy Tab 10.1 kernel source, fixed
and improved.

-retain SAMSUNG and ICS conditional
touchscreen: atmel_mxt1386: add back in mxt_suspend if not EARLYSUSPEND

-shaves off a few ms when waking device
touchscreen: atmel_mxt1386: bring back mxt_early/late_suspend/resume
Revert "rtc : tps6586x: move NULL checking to the front."

-this created a duplicate

This reverts commit 5e6a7a8f8b27b70d6d6c09556ebd358f4b328c0f.
rtc: fix tps6586x startup crash

The rtc_device_register() call has changed semantics so that it will
immediately call out to rtc_read_alarm() and since the callbacks require
the drvdata to be set, we need to set it before the registration call to
vaoid NULL dereference.

Based on 9cf3b5fa6f7b246784d62a2a7637a871290c9ab9
rtc: tps6586x: fix alarm1 overflow

tps6586 alarm1 has a 24-bit register, however LSB 10 bits [9:0] are
used as a counter of ticks per second. Therefore, the valid range is
within 0x3FFF seconds (14-bit width).

Check the value set to alarm1. Change the value to (current rtc[23:10]
minus 1) if the target value is larger than 0x3FFF (4 hours).
If no such fix, there might be overflow issues when alarm1 is enabled,
and the system might wakes up unexpectedly. This change is to keep
the system in suspend state as long as possible if alarm is enabled.

Bug 827056

Change-Id: Icb310132e08b56642179d92dfe00a34bfd28982a
Reviewed-on: http://git-master/r/32700
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Ken Chang <kenc@nvidia.com>
Reviewed-by: Yu-Fong (Foster) Cho <ycho@nvidia.com>
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-by: ChihJen Hsu <chhsu@nvidia.com>
rtc: tps6586x: fix error in setting alarm1

Alarm1 expiration time is set based on rtc value. Should not compare the
absolute rtc value with the valid range of alarm1 directly, expiration
time from now is used instead.

Bug 832563

Change-Id: I338e7ee684b5cad6b2fba99b5ac4ec6cff9b75cd
Reviewed-on: http://git-master/r/34295
Tested-by: Ken Chang <kenc@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-by: Yu-Fong (Foster) Cho <ycho@nvidia.com>
rtc: tps6586x: Fix for proper wakealarm

In the driver probe function, call device_init_wakeup() before
registering rtc device, so that wakealarm sysfs will be created.

BUG=889820

Change-Id: I957fdffb02cd7e43dd96db0794e2e9f8dc7bd3ee
Signed-off-by: Wei Ni <wni@nvidia.com>
Reviewed-on: http://git-master/r/58937
Reviewed-by: Allen Martin <amartin@nvidia.com>

Conflicts:

	drivers/rtc/rtc-tps6586x.c
rtc: rtc-tps6586x: add missing semi-colon to MODULE_ALIAS
Revert "video: tegra-ics: sync with ASUS's TF101 ICS kernel source"

This reverts commit 5689c26398223a72255a7d14dc59d89d54789109.
Revert "media: video: avp-ics: backport/sync with nvidia's 3.1"

This reverts commit 1d50abb94c5bfcc89140b10a753466f581157d7a.
tegra: backport/sync iovmm/iovmm-gart with nvidia's 2.6.39

-leave iovmm-gart segregated via ICS
-add syscore from nvidia's 2.6.39

-iovmm-ics:
 remove static from tegra_iovmm_suspend/tegra_iovmm_resume
Revert "media: fix corner case in tegra_mediaserver"

This reverts commit 0fa77914a6e4c235e1bb0379c7de833d62bd3e31.