net: wireless: bcmdhd: Fill station_info packet fields

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Use correct time from boot for TSF

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Merge remote-tracking branch 'common/linux-bcm43xx-2.6.39' into common-39
net: wireless: bcm4329: Remove obsolete files

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Update to Version 5.90.195.98

Change-Id: I2854300bc03b133d8276bea2f36f4c5253c551a1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Remove PMKID_CACHE and TXFAIL events for CFG80211

Change-Id: I82b6a1c9941485f3b47bc5978873379ab8853601
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Merge remote-tracking branch 'remotes/gs-common/android-2.6.39' into jellybean-r2

* remotes/gs-common/android-2.6.39:
  net: wireless: bcmdhd: Use correct time from boot for TSF
  net: wireless: bcmdhd: Fill station_info packet fields
Merge remote-tracking branch 'remotes/ca-common/aosp-new/linux-bcm43xx-2.6.39' into jellybean-r2

* remotes/ca-common/aosp-new/linux-bcm43xx-2.6.39:
  net: wireless: bcmdhd: Remove PMKID_CACHE and TXFAIL events for CFG80211
  net: wireless: bcmdhd: Update to Version 5.90.195.98
  net: wireless: bcm4329: Remove obsolete files
Revert "net: wireless: bcmdhd: Remove WL_CFG80211_STA_EVENT config option"

We have new APSTA firmware in JB that can handle this now.

This reverts commit 1ea71ff2a75f15ac303ba816fc53d1ccc9801fb2.
mmc: core: minor printk/pr_info cleanup

Change-Id: I7e75c9da8ca21af57da6f3188808ef367b6aad0d
mmc: core: add CSD entry "acc_size" to device attributes

AKA "SUPER_PAGE_SIZE". From the EMMC Spec: "This value can
be used by the master for the following cases: As a guide
for format clusters. To prevent format-page misalignment.
As a guide for minimum data-transfer size"

Change-Id: If5d22f96f680a1424502b70aafacdb5172615146
mm: allow per-device configurable VM_*_READAHEAD values

Set VM_MIN_READAHEAD to 32KB (minimum NAND xfer size) for Stingray
by default.

Change-Id: I5caf10ecbe64808cb24103f7ac528fe02f56b84c
USB: gadget: f_audio_source: Fix error handling and increase packet size

Fixes watchdog reset on USB disconnect
Larger packet size fixes performance in fullspeed mode

Signed-off-by: Mike Lockwood <lockwood@google.com>
Revert "ARM: tegra: clock: remove AHB shared clock to gadget USBC"

Commit d4511ac9d63bf84e7490ccf8564c747b6a365a6d ("Fix error handling
and increase packet size") makes this unnecessary.

This reverts commit 7c10f4f368be45c3f7ad3799294e760d0f4ba4a9.
BFQ IO Scheduler/400MHz GPU/TCP Congestion changes

Change-Id: If8e8604df855c9fef017fe3a31fa2979742480a6

Conflicts:

	arch/arm/configs/stingray_defconfig
Revert "add the BFQ-scheduler v3r2 for 2.6.39 by Paolo Valente"

Prepare for move to V4.

This reverts commit 5e89f242dafc154ca8b76c3a77e403e981188e3e.
block: prepare I/O context code for BFQ-v4 for 2.6.39

BFQ uses struct cfq_io_context to store its per-process per-device data,
reusing the same code for cic handling of CFQ.  The code is not shared
ATM to minimize the impact of these patches.

This patch introduces a new hlist to each io_context to store all the
cic's allocated by BFQ to allow calling the right destructor on module
unload; the radix tree used for cic lookup needs to be duplicated
because it can contain dead keys inserted by a scheduler and later
retrieved by the other one.

Update the io_context exit and free paths to take care also of
the BFQ cic's.

Change the type of cfqq inside struct cfq_io_context to void *
to use it also for BFQ per-queue data.

A new bfq-specific ioprio_changed field is necessary, too, to avoid
clobbering cfq's one, so switch ioprio_changed to a bitmap, with one
element per scheduler.

Signed-off-by: Fabio Checconi <fabio@gandalf.sssup.it>
Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
block: cgroups, kconfig, build bits for BFQ-v4-2.6.39

Add a Kconfig option and do the related Makefile changes to compile
the BFQ I/O scheduler.  Also let the cgroups subsystem know about the
BFQ I/O controller.

Signed-off-by: Fabio Checconi <fabio@gandalf.sssup.it>
Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
block: introduce the BFQ-v4 I/O sched for 2.6.39

Add the BFQ-v4 I/O scheduler to 2.6.39.
The general structure is borrowed from CFQ, as much code. A (bfq_)queue is
associated to each task doing I/O on a device, and each time a scheduling
decision has to be taken a queue is selected and it is served until it expires.

    - Slices are given in the service domain: tasks are assigned budgets,
      measured in number of sectors. Once got the disk, a task must
      however consume its assigned budget within a configurable maximum time
      (by default, the maximum possible value of the budgets is automatically
      computed to comply with this timeout). This allows the desired latency
      vs "throughput boosting" tradeoff to be set.

    - Budgets are scheduled according to a variant of WF2Q+, implemented
      using an augmented rb-tree to take eligibility into account while
      preserving an O(log N) overall complexity.

    - A low-latency tunable is provided; if enabled, both interactive and soft
      real-time applications are guaranteed very low latency.

    - Latency guarantees are preserved also in presence of NCQ.

    - High throughput with flash-based devices, while still preserving
      latency guarantees.

    - Useful features borrowed from CFQ: cooperating-queues merging (with
      some additional optimizations with respect to the original CFQ version),
      static fallback queue for OOM.

    - BFQ supports full hierarchical scheduling, exporting a cgroups
      interface.  Each node has a full scheduler, so each group can
      be assigned its own ioprio and an ioprio_class.

    - If the cgroups interface is used, weights can be explictly assigned,
      otherwise ioprio values are mapped to weights using the relation
      weight = IOPRIO_BE_NR - ioprio.

    - ioprio classes are served in strict priority order, i.e., lower
      priority queues are not served as long as there are higher priority
      queues.  Among queues in the same class the bandwidth is distributed
      in proportion to the weights of each queue. A very thin extra bandwidth
      is however guaranteed to the Idle class, to prevent it from starving.

Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
BFQ scheduler, 512KB default Readahead for Stingray

Change-Id: I1be01bcec90b73690106b4f6c620ce37b59b4970