]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commit
Merge branch 'android-3.10' into 'dev-kernel-3.10'
authorSumit Singh <sumsingh@nvidia.com>
Mon, 24 Nov 2014 04:55:24 +0000 (10:25 +0530)
committerSumit Singh <sumsingh@nvidia.com>
Mon, 1 Dec 2014 05:35:24 +0000 (11:05 +0530)
commit06771dc53f546cde7f1ab55f03a2bb2fd2d7efa5
tree5572623934e3810ee63dfe8260fabdf117875d84
parent85e66d9e32f18056d55cd1781c9c76d80c0bc069
parentcce78bc02ff0ea2d21e88e3438d65272b898aa35
Merge branch 'android-3.10' into 'dev-kernel-3.10'

As kernel build was giving error as below:
- missing braces around initializer [-Werror=missing-braces]

So, made modifications in sound/soc/tegra-alt/tegra210_adsp_alt.c
and sound/soc/tegra/tegra30_avp.c to fix above error.

Bug 200058653

Change-Id: I5812d4b4b058f509bcb559df427c4ed78e5cd16e
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
17 files changed:
Documentation/networking/ip-sysctl.txt
drivers/base/power/main.c
drivers/base/power/wakeup.c
drivers/base/syscore.c
include/linux/cgroup.h
include/linux/ipv6.h
include/linux/suspend.h
kernel/cgroup.c
kernel/irq/pm.c
kernel/power/process.c
kernel/power/suspend.c
kernel/sched/core.c
mm/memcontrol.c
net/ipv6/addrconf.c
sound/core/compress_offload.c
sound/soc/tegra-alt/tegra210_adsp_alt.c
sound/soc/tegra/tegra30_avp.c