Revert "Revert "net: wireless: bcmdhd: Fix WD wakelock behavior""

This reverts commit d5a18e013da25a07b330fd70c212ac477cabff4e.
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
ARM: tuna: defconfig: enable CONFIG_EXT4_FS_XATTR and CONFIG_EXT4_FS_SECURITY

Enable CONFIG_EXT4_FS_XATTR and CONFIG_EXT4_FS_SECURITY.

Change-Id: I720d8fa3300bae4845c6b61c3a12be05e6124089
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Merge remote-tracking branch 'omap/android-omap-3.0' into android-omap-tuna-3.0

* omap/android-omap-3.0:
  netfilter: xt_qtaguid: Allow tracking loopback
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Merge remote-tracking branch 'common/android-3.0' into android-omap-3.0

* common/android-3.0:
  net: ipv6: Don't purge default router if accept_ra=2
  net: wireless: bcmdhd: Enable SUPPORT_PM2_ONLY mode
  net: wireless: bcmdhd: Add SUPPORT_PM2_ONLY option
Merge remote-tracking branch 'omap/android-omap-3.0' into android-omap-tuna-3.0

* omap/android-omap-3.0:
  net: ipv6: Don't purge default router if accept_ra=2
Merge branch 'android-3.0' into android-omap-3.0
Merge branch 'linux-omap-3.0' into android-omap-3.0
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
ARM: tuna: defconfig: disable SCHED_TRACER, enable DEFAULT_TRACERS

Bug: 6576660
Change-Id: I67f195c176cecc335f7fd5b2fb52691d1323ce9b
Signed-off-by: JP Abgrall <jpa@google.com>
Merge branch 'android-3.0' into android-omap-3.0
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Merge branch 'android-3.0' into android-omap-3.0
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Merge branch 'android-3.0' into android-omap-3.0
Merge branch 'linux-omap-3.0' into android-omap-3.0