glacier: fixup audience a1026 initialization

Change-Id: I55efb39d291615de1491c004cb5bea7d01e0d9af
glacier: board cleanup

Change-Id: Iab5e44a0fe79abd6764c63173ee4a0d2130c6eea
mach-msm: add config to oc kgsl-3d0

Change-Id: If7bd30397fa6e793ef72c0a32b50314debc9f112
htc: remove extra calls to camera_on_gpio_table

Change-Id: I6cf67c48620bda1df2d2ac0c36e406cbb23b8627
Revert "board: lexikon: update ic2 freq"

This reverts commit b83b5adf8cc55905ab0d32a58f3e1041cf05a4b8.
mach-msm: lexikon: Missing display_height attribute for synaptics TS
mach-msm: lexikon: missing spi_qsd data
config: lexikon: Disable atmel usb vbus detection
speedy:vivow: board cleanup

 * follow the same setup as glacier

Change-Id: I8ac2825e8289740467e4aa0b56784484fda7789c
msm7x30: enable ion

Change-Id: I25ab5d76337afd6f2f761384f80859acde886da6
msm7x30: use ION_CAMERA_HEAP

Change-Id: I833460e30f1ab4f25c8a47f546059d8c3ea235fc
devices-msm7x30: use ION_CAMERA_HEAP_ID for vidc

Change-Id: Id02428733bbcfbe4f6fd5baffd92ab5d9c9cb6e5
vidc: sync with jb_mr1_chocolate

Change-Id: I4a12ff277c421aaa2290651e7663dba567e38518
msm: vidc: Force the encoding driver to use PMEM.

Our prebuilt camera libs do not support ION.

Change-Id: I562ede04d33de2f5a6c0cc18021cd766c9830bda
speedy/vivow: Add missing camera memory allocation

Change-Id: I7ca8537a68913fb7836978e6886153ae83b2fc34
tcp: add a sysctl to config the tcp_default_init_rwnd

The default initial rwnd was hardcoded to 10.

Now we allow it to be controlled via
  /proc/sys/net/ipv4/tcp_default_init_rwnd
which limits the values from 3 to 100

This is somewhat needed because ipv6 routes are
autoconfigured by the kernel.

See "An Argument for Increasing TCP's Initial Congestion Window"
in https://developers.google.com/speed/articles/tcp_initcwnd_paper.pdf

Change-Id: I7eac8a0a5133371aea9ecb9aec0b608bd7f2cc57
Signed-off-by: JP Abgrall <jpa@google.com>
android: configs: Grab the android/configs from kernel/common

This is a squash of all changes from kernel/common android-3.4 up to
  5e35d66 android: configs: add IPV6 ROUTE INFO

Change-Id: I848f1865ec7da1dfc3338a3e9d7f944a6f00f2a6
Signed-off-by: JP Abgrall <jpa@google.com>
android: configs: Add CONFIG_NETFILTER_XT_TARGET_IDLETIMER

Signed-off-by: Ashish Sharma <ashishsharma@google.com>
android: base-cfg: enable DM_VERITY (used for secureboot)

Change-Id: I68d769f97ffa76bb45e65d34a96dd7f558c02d08
Signed-off-by: JP Abgrall <jpa@google.com>
(cherry picked from commit 37cb5bec8983e505eecb730188bfc113d087dee7)
kconfig: add merge_config.sh script

After noticing almost every distro has their own method of managing config
fragments, I went looking at some best practices, and wanted to try to
consolidate some of the different approaches so this fairly simple
infrastructure can be shared (and new distros/build systems don't have to
implement yet another config fragment merge script).

This script is most influenced by the Windriver tools used in the Yocto
Project, reusing some portions found there.

This script merges multiple config fragments, warning on any overridden
values.  It then sets any unspecified values to their default, then
finally checks to make sure no specified value was dropped due to
unsatisfied dependencies.

I'm sure this implementation won't work for everyone, and I expect it will
need to evolve to adapt for various use cases.  But I think its a
reasonable starting point.

Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Greg Thelen <gthelen@google.com>
Cc: Reinhard Tartler <Reinhard.Tartler@informatik.uni-erlangen.de>
Cc: Dmitry Fink <Dmitry.Fink@palm.com>
Cc: Darren Hart <dvhart@linux.intel.com>
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Bruce Ashfield <Bruce.Ashfield@windriver.com>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Nick Reuter <nreuter85@gmail.com>