gpu: ion: Modify ION_NUM_HEAPS to reflect actual max

ION_NUM_HEAPS is meant to represent the actual max number
of heap types in the system, but currently doesn't reflect
any custom heaps.  This patch changes it to 16.

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
CHROMIUM: cpufreq: ondemand: io_is_busy should be 1 for ARM

Be conservative for now and only set it for V7 and newer versions.

BUG=chrome-os-partner:11403
TEST=build, boot, check boot time.

Change-Id: Ia4460efadf106c75608aac85a1f90d773af46cf2
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/29435
Reviewed-by: Sameer Nanda <snanda@chromium.org>
(cherry picked from commit c735c9458ec2f8141ec6f61ab1f792feb2056c1e)
Reviewed-on: https://gerrit.chromium.org/gerrit/30083
Reviewed-by: Katie Roberts-Hoffman <katierh@chromium.org>
Tested-by: Katie Roberts-Hoffman <katierh@chromium.org>
configs: DEFAULT_TCP_CONG="westwood"
bcmdhd: Enable Ad-Hoc (IBSS) mode

This enables Ad-Hoc (IBSS) mode for bcmdhd. We basically just need to set the
interface flag and avoid some P2P specific settings while scanning.

Also add the "station get" command for IBSS mode.

Signed-off-by: Bruno Randolf <br1@einfach.org>

Change-Id: I10a047f76495d7fedfee16d0ac10de239e494567
cpufreq: interactive: base above_hispeed_delay on target freq, not current

Time to wait should be based on the intended target speed, not the
actual speed (which may be held high by another CPU).

Change-Id: Ifc5bb55d06adddb9a02af90af05398a78f282272
Reported-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Revert "slub: fix a possible memory leak"

This reverts commit 73d93e7814029d4c8bfc57c3a7b6ca2f31e0a4bd.
Revert "hashtable: introduce a small and naive hashtable"

This reverts commit 9d0e3ec79da902a39be415a133dc8187eb1ee55e.
Revert "block,elevator: use new hashtable implementation"

This reverts commit 62a3575afb0389058dae1d9826b2a50ca4dc40b7.
patch-3.0.71-rc1

https://www.kernel.org/pub/linux/kernel/v3.0/stable-review/
Revert "netfilter: xt_qtaguid: remove AID_* dependency for access control"

This reverts commit ffe51fe6c4a519edcb149490593f3a27ffb5e6ec.
Merge remote-tracking branch 'kernel-common/android-3.0' into nutest
DVFS_LIMIT value from epic4g old 2.6.35 custom kernel