Merge branch 'master' into next

Browse source

Conflicts:
	security/keys/keyring.c

Resolved conflict with whitespace fix in find_keyring_by_name()

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

...

This commit is contained in:

James Morris 2010-05-06 22:21:04 +10:00

parent 2928238142 722154e4ca

commit 043b4d40f5

41 changed files with 508 additions and 196 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

1

include/net/sctp/structs.h

View file

2

include/net/sock.h

View file