ARM: herring: Switch to built-in CFG80211 wlan driver

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Daemonize wl_event_handler

Daemonizing makes thread (besides other things) NON-FREEZABLE, and it will not
get fake signal on suspend to quicl down_interruptible()

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Merge remote-tracking branch 'common/android-3.0' into android-samsung-30-wip-mergedown

* common/android-3.0:
  Input: evdev - fix variable initialisation
  Input: evdev - Add ioctl to block suspend while event queue is not empty.
  Input: evdev - Don't hold wakelock when no data is available to user-space
  net: wireless: bcmdhd: Increase pm_notify callback priority
  net: wireless: bcmdhd: Fix crash on dhdsdio_probe_attach() failure
  net: wireless: bcmdhd: Daemonize wl_event_handler
  net: wireless: bcmdhd: Update to Version 5.90.195.23
  net: wireless: bcmdhd: Update to Version 5.90.195.22
  net: wireless: bcmdhd: Update to Version 5.90.195.19
  net: wireless: bcmdhd: Update to Version 5.90.195.15
  net: wireless: bcmdhd: Add WIPHY_FLAG_SUPPORTS_FW_ROAM flag
  net: wireless: bcmdhd: Fake PNO event to wake up the wpa_supplicant
  usb: gadget: android: Honor CONFIG_USB_GADGET_VBUS_DRAW
  usb: gadget: Fix usb string id allocation
  nl80211/cfg80211: Make addition of new sinfo fields safer
  cfg80211/nl80211: Send AssocReq IEs to user space in AP mode
  misc: remove android pmem driver, it's obsolete.
  Revert "proc: enable writing to /proc/pid/mem"
  ram_console: set CON_ANYTIME console flag

Conflicts:
	drivers/misc/Kconfig

Change-Id: I7d64300b228a0fc05e700f283a02f830bcadd371
power: enable USB VBUS of cp and WiMAX

Enable the VBUS of CP and WiMAX for debugging purpose.
This change has no effect on the current implementation
until USB path of CP or WiMAX is changed by the user.

Signed-off-by: Thomas Ryu <smilesr.ryu@samsung.com>
Merge branch 'android-3.0' into android-samsung-3.0-wip
mmc: sdhci: Allow mmc_suspend_host/mmc_resume_host for sdio devices

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ARM: s5pv210: herring: don't disable prox sensor during suspend

A previous change caused the proximity sensor to become
disabled during suspend to reduce power consumption , but this
needs to remain on if activated.

Change-Id: I74920c10b89c4dacd9688dc8db689fb097d64087
Signed-off-by: Simon Wilson <simonwilson@google.com>
Merge branch 'android-3.0' into android-samsung-3.0-wip
mmc: sdhci: Skip rest of suspend if mmc_suspend_host() fails

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
herring_defconfig: enable dynamic debug

We need this temporarily to debug watchdog issues around resume.
There will be a matching init.rc change to allow non-root user builds
to change debugging at runtime.

Change-Id: Ib5359e7d2874fe738f19ca1aeec19369917d02d2
Signed-off-by: JP Abgrall <jpa@google.com>
Merge branch 'android-3.0' into android-samsung-3.0-wip
gpu: pvr: Update to DDK 1.8@794370

Change-Id: I403eb902947b552d5b17260e05b8d5543d99c977
gpu: pvr: Update to DDK 1.8@795947

Change-Id: I62fe8e0f0c5f4046a4852d8dfb92c8b0991df378
gpu: pvr: Update to DDK 1.8@796887.

 - Re-introduce DC refcounting fix, which makes an unrelated (and
   unfixed) problem more reproducible.
 - Fix a bug where the driver would not wait for propagation (during
   power transitions) before performing a soft reset.

Change-Id: I192e23f652dc01eb5f08a0abd48e156564fd0bb5
gpu: pvr: Update to DDK 1.8@808799

 - Fix a bad pointer dereference in services DC.
 - Correct GPL license text in two files.

Change-Id: I0eacdabd5f690969a372bdd88b8d0e7bc2b775ff
gpu: pvr: Update to DDK 1.8@813213

 - Add PVRSRV_MMU_MAKE_READWRITE_ON_DEMAND feature for Crespo MapPage()
   crash bug investigation. This will write-protect the MMU pagetables
   when the SGX driver is not modifying them.

Change-Id: I450ead2b020d42dde14522b46c06f63eb75ff6b5
gpu: pvr: Switch on MMU pagetable write-protection.

Make the SGX MMU page tables read-only when the SGX driver has
finished writing them. Should catch other drivers writing to the
page-table memory when they do not own it.

Change-Id: I49800be0188878f7992d0a4d72360761c6c74007
gpu: pvr: Update to DDK 1.8@840215

Change-Id: I899b6a4ed9e88a0e5c4c2e426aee4e11de846a14
herring_defconfig: enable KSM

This is passive until userspace says that pages can be merged.

Change-Id: Ie32b2c3df0439f695f7bd4caaf17e9413e450fd8
Signed-off-by: Iliyan Malchev <malchev@google.com>
Merge branch 'android-3.0' into android-samsung-3.0-wip