Merge branch 'for-3.14-fixes' into for-3.15

Browse source

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>

...

This commit is contained in:

Tejun Heo 2014-02-08 10:37:14 -05:00

parent 3417ae1f5f 48573a8933

commit 1a698a4aba

6 changed files with 24 additions and 17 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

MAINTAINERS

View file

1

arch/arm/mach-tegra/pm.c

View file

1

fs/nfs/nfs3proc.c

View file

35

kernel/cgroup.c

View file

1

kernel/power/console.c

View file

1

mm/vmpressure.c

View file