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>
Showing
- MAINTAINERS 2 additions, 0 deletionsMAINTAINERS
- arch/arm/mach-tegra/pm.c 1 addition, 0 deletionsarch/arm/mach-tegra/pm.c
- fs/nfs/nfs3proc.c 1 addition, 0 deletionsfs/nfs/nfs3proc.c
- kernel/cgroup.c 18 additions, 17 deletionskernel/cgroup.c
- kernel/power/console.c 1 addition, 0 deletionskernel/power/console.c
- mm/vmpressure.c 1 addition, 0 deletionsmm/vmpressure.c
Loading
Please register or sign in to comment