Merge branch 'master' into next

Browse source

Conflicts:
	fs/nfsd/nfs4recover.c

Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().

Signed-off-by: James Morris <jmorris@namei.org>

...

This commit is contained in:

James Morris 2008-12-04 17:16:36 +11:00

parent 3496f92beb feaf3848a8

commit ec98ce480a

542 changed files with 8290 additions and 4575 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

10

kernel/sysctl.c

View file