linux-next: manual merge of the trivial tree

Hi Jesper,

Today's linux-next merge of the trivial tree got a tivial conflict in
include/linux/securebits.h between commit
086f7316f0d400806d76323beefae996bb3849b1 ("security: filesystem
capabilities: fix fragile setuid fixup code") from Linus' tree and commit
0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 ("Tighten up the use of loose")
from the trivial tree.

This was a trivial conflict (by definition of the tree :-)) the former
commit changed a comment and fixed the instance of loose to lose, so I
used that version.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/