bcmdhd: restore state from edd8a9171858fad7713b8fc07b158df5114b3c1a (samsung update 4)

Change-Id: I5f216c0b67ce9a956d2af26f58fa0744cdc1d7f5

Conflicts:

	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/bcmspibrcm.c
	drivers/net/wireless/bcmdhd/include/bcmspibrcm.h
	drivers/net/wireless/bcmdhd/include/epivers.h
	drivers/net/wireless/bcmdhd/include/spid.h
	drivers/net/wireless/bcmdhd/src/dhd/sys/dhd.h
	drivers/net/wireless/bcmdhd/src/dhd/sys/dhd_cdc.c
	drivers/net/wireless/bcmdhd/src/dhd/sys/dhd_common.c
	drivers/net/wireless/bcmdhd/src/dhd/sys/dhd_custom_sec.c
	drivers/net/wireless/bcmdhd/src/dhd/sys/dhd_linux.c
	drivers/net/wireless/bcmdhd/src/dhd/sys/dhd_sdio.c
	drivers/net/wireless/bcmdhd/src/include/bcmutils.h
	drivers/net/wireless/bcmdhd/src/include/wlioctl.h
	drivers/net/wireless/bcmdhd/src/wl/sys/wl_android.c
	drivers/net/wireless/bcmdhd/src/wl/sys/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/src/wl/sys/wl_cfg80211.h
	drivers/net/wireless/bcmdhd/src/wl/sys/wl_cfgp2p.c
	drivers/net/wireless/bcmdhd/src/wl/sys/wl_cfgp2p.h
	drivers/net/wireless/bcmdhd/src/wl/sys/wldev_common.h
bcmdhd: enable p2p interface

Change-Id: I1186d91af7f6e6427cd8c3e60dee00d6e224ce09
Revert "mali: gpu boost on touch"

This reverts commit 42edc86023999800d825bc880d51ad0758fe732b.

Conflicts:

	drivers/media/video/samsung/mali/linux/mali_kernel_linux.c
	drivers/media/video/samsung/mali_r3p0_lsi/common/mali_osk.h
mdnie: cyanogenmod

Change-Id: Id51499b4d2b7bf149a835256f03de125fe39b23a

Conflicts:

	drivers/video/samsung/mdnie_table_c1m0.h
Revert "bcmdhd: enable p2p interface"

This reverts commit 663306e5096115996b7ddcae521ee3a477155f0b.
Revert "bcmdhd: restore state from edd8a9171858fad7713b8fc07b158df5114b3c1a (samsung update 4)"

This reverts commit 595840520b1dd9fbfc5caba743bf2a6325166cf5.
bcmdhd: additional wireless driver for cm10
Revert "mdnie: cyanogenmod"

This reverts commit 16cc651df120af65460e113dd2d794df1497dc87.
Revert "mmc: increase mmc timeout for faulty cards"

This reverts commit c928c3d749164320720a3102cde5541d144c2084.
mmc: use really long write timeout to deal with crappy cards

Several people have noticed that crappy SD cards take much longer to
complete multiple block writes than the 300ms that Linux specifies.
Try to work around this by using a three second write timeout instead.

This is a generalized version of a patch from Chase Maupin
<Chase.Maupin@ti.com>, whose patch description said:

* With certain SD cards timeouts like the following have been seen
  due to an improper calculation of the dto value:
    mmcblk0: error -110 transferring data, sector 4126233, nr 8,
    card status 0xc00
* By removing the dto calculation and setting the timeout value
  to the maximum specified by the SD card specification part A2
  section 2.2.15 these timeouts can be avoided.
* This change has been used by beagleboard users as well as the
  Texas Instruments SDK without a negative impact.
* There are multiple discussion threads about this but the most
  relevant ones are:
    * http://talk.maemo.org/showthread.php?p=1000707#post1000707
    * http://www.mail-archive.com/linux-omap@vger.kernel.org/msg42213.html
* Original proposal for this fix was done by Sukumar Ghoral of
  Texas Instruments
* Tested using a Texas Instruments AM335x EVM

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Revert "sched/nohz: Rewrite, fix and add more accurate load-avg computation"

This reverts commit c0478d0be6f52748eec75f0f5f43ba45bf1acda0.
cpufreq_pegasusq: tiny tweaks

-revert back to defaults and use scripts to modify them
-decrease freq_step when the screen is off
-averaging logic
mms_ts: touch gestures optimizations by Tungstwenty
mali: disable resume freq
mms_ts: slide2wake (part1)
Merges with s2 kernel
cpufreq-4x12: modify multipliers
Revert "f_mtp_samsung: revert to update2 sources to get MTP working on OSX"

This reverts commit 717f91a1cd13ab4d0078a4c83195b079c12d4c9b.
v1.7