diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-08 16:37:14 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-08 16:37:14 +0100 |
| commit | 1a698a4aba26dd58e8409d325a9a9db22f7cd2db (patch) | |
| tree | bc4b414c7eca762c0bac1176bd1d63b74c9f965e /arch | |
| parent | cgroup: remove cgroup_root_mutex (diff) | |
| parent | cgroup: fix locking in cgroup_cfts_commit() (diff) | |
| download | linux-1a698a4aba26dd58e8409d325a9a9db22f7cd2db.tar.xz linux-1a698a4aba26dd58e8409d325a9a9db22f7cd2db.zip | |
Merge branch 'for-3.14-fixes' into for-3.15
Pending kernfs conversion depends on fixes in for-3.14-fixes. Pull it
into for-3.15.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/pm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c index 4ae0286b468d..f55b05a29b55 100644 --- a/arch/arm/mach-tegra/pm.c +++ b/arch/arm/mach-tegra/pm.c @@ -24,6 +24,7 @@ #include <linux/cpu_pm.h> #include <linux/suspend.h> #include <linux/err.h> +#include <linux/slab.h> #include <linux/clk/tegra.h> #include <asm/smp_plat.h> |