net: wireless: bcmdhd: Combined P2P fixes

- Fix p2p scan
- Fix p2p processing for channels 12 and 13
- Fix service discovery

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Merge remote-tracking branch 'kcrudup/ics-2.6.39' into ics
net: wireless: bcmdhd: Reload FW in case of constant scan failure

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Reduce priority for dhd_dpc and watchdog

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
fix build errors using gcc-4.7

Error: selected processor does not support ARM mode `smc #0'
error: DIV usage mismatch between arch/arm/boot/compressed/head.o and output
error: DIV usage mismatch between arch/arm/boot/compressed/misc.o and output
error: DIV usage mismatch between arch/arm/boot/compressed/decompress.o and output
error: DIV usage mismatch between arch/arm/boot/compressed/lib1funcs.o and output
error: DIV usage mismatch between arch/arm/boot/compressed/ashldi3.o and output

Change-Id: I1251b843bb9b4c74ba8039fd194e3aed2183cf5b

Conflicts:

	arch/arm/boot/compressed/Makefile
	security/smc/Makefile
ARM: force building for Cortex-A9
net: wireless: bcmdhd: Ignore error if "chanspecs" command is not supported

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
(cherry picked from commit 562490d2472d7a2074f52c98e08535abdf555393)
ARM: tegra: stingray: fix "Unbalanced IRQ 358 wake disable" dump at boot
ARM: Makefile: Unify custom per-machine GCC build options to one place

commit 7478c7f0 (hardfloat + toolchain change) scattered a bunch of
GCC options all over "Makefile" and "arch/arm/Makefile", some of them
either redundant, unnecessary or duplicated. Roll back both Makefiles
to their kernel.org standard, and add the "CONFIG_EOS_MAKE_TUNING"
Kconfig option so that any GCC build options may be consolidated
there (and customized per-machine or per-cpu if desired).

Add some preferred options for the Moto Xoom (MACH_STINGRAY) to start.
ARM: Makefile: tuning: improve compatibility with several compilers

With these changes, I have been able to successfully build with:

arm-linux-androideabi-4.4.x/bin/arm-linux-androideabi-gcc [1]
arm-eabi-4.4.3/bin/arm-eabi-gcc
arm-linux-androideabi-4.6/bin/arm-linux-androideabi-gcc
arm-linux-androideabi-gcc (Linaro GCC 4.7-2012.05) 4.7.1 20120514 (prerelease)
arm-none-linux-gnueabi-gcc (Sourcery G++ Lite 2010q1-202) 4.4.1

[1] - section heading error in arch/arm/mach-tegra/pm-t2.c
usb: gadget: composite: Fix corruption when changing configuration

Remove the config from the configs list before releasing the spinlock.
Otherwise the other cpu might be processing a SET_CONFIGURATION that
will switch to the configuration that is being released.

Bug: 6521576
Change-Id: Id4da0d0e18ead63e20cb236cd1d3e8e6d116acce
Signed-off-by: Benoit Goby <benoit@android.com>
usb: gadget: android: Fix product name

Product names may contain spaces and scanf %s only matches the 1st word.
Use strlcpy instead.

Change-Id: Ie8703fea9775f7fc17fe615a42597ca3816d36b0
Signed-off-by: Benoit Goby <benoit@android.com>

Conflicts:
	drivers/usb/gadget/android.c
taging: android: lowmemorykiller: reduce slots add more debug info

We'd reserved 12 slots for HC, but ICS has finer control over the
slot values, so revert back to 6. Also, count the number of times
we're called as a shrinker (for any reason) and the number of times
we select a process to kill.
net: wireless: bcmdhd: Skip inaccurate wl_construct_reginfo() call

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
(cherry picked from commit 38fac5b1e2604aaf3ffae7ebadf219eb567cb61f)
mmc: block: cleanup of "Remove use of mmc_blk_set_blksize"

Fix merge errors
staging: android: lowmemorykiller: revert to the Moto released version

My LMK changes were for HC, and don't fare well with the new ICS+
memory-management model (and it would cause the kernel to leak memory
as it would push pages to unrecoverable, if the user-space settings
weren't quite right), so just give up on them.
Merge remote-tracking branch 'kcrudup/ics-2.6.39' into ics

Conflicts:
	Makefile