Enable audit and auditsyscall.  Needed for 4.3
Signed-off-by: scott <scott@ubuntu.com>
drvers: wireless: bcmdhd: set MMC_PM_KEEP_POWER on suspend
Signed-off-by: scott <scott@ubuntu.com>
net: wireless: bcmdhd: move barrier to after setting the suspended flag
Signed-off-by: scott <scott@ubuntu.com>
Enable trim in lvm
Signed-off-by: scott <scott@ubuntu.com>
Revert another samsung change to mmc/chip/block.c

Change-Id: Ie2fbe3d5a089735533ce411146c9f8220378e7bf
[sd/mmc] remove atheros stuff, which doesn't apply to us.

Change-Id: I73373dff6075cfdd723a48915c2f82cbf096fbdd
[sd/mmc] make core/core.c a bit quieter

Change-Id: I8b73f32de5eefada6fc342c572450513f8280e0d
Screw it. Use aries sd/mmc code.

This fixes my problem where when all devices are disabled, the phone
will lock up on suspend.

Change-Id: I5ad02a544f96c68de378dc5c401716d1f5a77c04
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	drivers/mmc/core/core.c
	drivers/mmc/host/sdhci.c
use wifi from 1.15.15
Signed-off-by: scott <scott@ubuntu.com>
remove legacy code
Signed-off-by: scott <scott@ubuntu.com>
switch drivers again.
Signed-off-by: scott <scott@ubuntu.com>
net/wireless: Support to disable CCK rate for management frame

Provision to distinguish the P2P scan and the normal scan
with no_cck flag and thus disable the 11b rates for
p2p scan.

Signed-off-by: Sunil Dutt Undekari<duttus@codeaurora.org>
(cherry picked from commit 08166fc6f488afef37101a63881ec01613971952)

Change-Id: I4490982a7e6c8f99851b84081cb718b6b8541721
Signed-off-by: Gopal G Goberu <ggober@codeaurora.org>
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	include/linux/nl80211.h
	net/wireless/nl80211.c
nl80211: Add probe response offload attribute

Notify user-space about probe-response offloading support in the driver.
A wiphy flag is used to indicate support and a bitmap of protocols
determines which protocols are supported.

Change-Id: I13b16c71449ab61f4308b6caa1cca35529f905b4
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	include/net/cfg80211.h
nl80211/cfg80211: Add crypto settings into NEW_BEACON

This removes need from drivers to parse the beacon tail/head data
to figure out what crypto settings are to be used in AP mode in case
the Beacon and Probe Response frames are fully constructed in the
driver/firmware.

nl80211/cfg80211: Allow SSID to be specified in new beacon command

This makes it easier for drivers that generate Beacon and Probe Response
frames internally (in firmware most likely) in AP mode.

nl80211/cfg80211: Add extra IE configuration to AP mode setup

The NL80211_CMD_NEW_BEACON command is, in practice, requesting AP mode
operations to be started. Add new attributes to provide extra IEs
(e.g., WPS IE, P2P IE) for drivers that build Beacon, Probe Response,
and (Re)Association Response frames internally (likely in firmware).

Change-Id: Ib91cd3fa2bad68e3724db98985e3f3bac72715f0
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	include/linux/nl80211.h
	net/wireless/nl80211.c
cfg80211: Validate cipher suite against supported ciphers

Instead of using a hardcoded list of cipher suites in nl80211.c, use a
shared function in util.c to verify that the driver advertises support
for the specified cipher. This provides more accurate validation of the
values and allows vendor-specific cipher suites to be added in drivers.

Signed-off-by: Jack Cheung <jackc@codeaurora.org>
(cherry picked from commit 976d06b486373ade56494e7ad41660e5db24f6bf)

Change-Id: I8d1494892cc6c3528b5aeae01d5e526602d72d8f
Signed-off-by: Srivalli Oguri <oguri@codeaurora.org>
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	net/wireless/nl80211.c
switch back to bcmdhd_samsung again.. and rename from 4330 to dhd.
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:

	arch/arm/configs/aries_infuse4g_defconfig