d2: defconfig: Fix bcmdhd fw path

Upon concating revision for bcmdhd, the bcmdhd driver appends the
chip version to fw path. The current fw path can cause issues upon
enablement due to setting the firmware path to:

    /system/etc/wifi/bcmdhd_sta.bin_b2_b2

Change-Id: I664bd3e4594673c1fce91219d99df3821661274e
Signed-off-by: Luis Cruz <ljc2491@gmail.com>
Merge remote-tracking branch 'korg/linux-3.4.y' into cm-11.0
sched/core: Fix missed printk_sched

* renamed to printk_deferred in previous commit

Change-Id: Ida094e87cdaa211b8b1edd17111455b68a6af24f
Merge remote-tracking branch 'caf/kk_2.7_rb1.42' into cm-11.0

Conflicts:
	net/ipv4/ping.c

Change-Id: I828218201ee602f5deec3110f950265920b47296
f2fs: resync with upstream 3.4 branch (forced update)

Change-Id: I0307382d983e8ef806cfdfe57dcde500fd060995
usb: gadget: f_audio_source: Fixed USB Audio Class Interface Descriptor

Fixed Android Issue #56549.

When both Vendor Class and Audio Class are activated for AOA 2.0,
the baInterfaceNr of the AudioControl Interface Descriptor points
to wrong interface numbers. They should be pointing to
Audio Control Device and Audio Streaming interfaces.

Replaced baInterfaceNr with the correct value.

Change-Id: Ib20f20c1d65887bac051b7ff9453dc53fc23a8d0
Signed-off-by: Anson Jacob <ansonkuzhumbil@gmail.com>
ext4: Add support for FIDTRIM, a best-effort ioctl for deep discard trim

* What
This provides an interface for issuing an FITRIM which uses the
secure discard instead of just a discard.
Only the eMMC command is "secure", and not how the FS uses it:
due to the fact that the FS might reassign a region somewhere else,
the original deleted data will not be affected by the "trim" which only
handles un-used regions.
So we'll just call it "deep discard", and note that this is a
"best effort" cleanup.

* Why
Once in a while, We want to be able to cleanup most of the unused blocks
after erasing a bunch of files.
We don't want to constantly secure-discard via a mount option.

From an eMMC spec perspective, it tells the device to really get rid of
all the data for the specified blocks and not just put them back into the
pool of free ones (unlike the normal TRIM). The eMMC spec says the
secure trim handling must make sure the data (and metadata) is not available
anymore. A simple TRIM doesn't clear the data, it just puts blocks in the
free pool.
JEDEC Standard No. 84-A441
  7.6.9 Secure Erase
  7.6.10 Secure Trim

From an FS perspective, it is acceptable to leave some data behind.
 - directory entries related to deleted files
 - databases entries related to deleted files
 - small-file data stored in inode extents
 - blocks held by the FS waiting to be re-used (mitigated by sync).
 - blocks reassigned by the FS prior to FIDTRIM.

Change-Id: I676a1404a80130d93930c84898360f2e6fb2f81e
Signed-off-by: Geremy Condra <gcondra@google.com>
Signed-off-by: JP Abgrall <jpa@google.com>