linux-next: manual merge of the akpm tree with the rr tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got conflicts in
kernel/lglock.c, include/linux/lglock.h, fs/namespace.c and fs/internal.h
between various commits from the rr tree and commit "brlocks/lglocks:
cleanups" from the akpm tree.

The akpm tree patch seems to be a merge of the rr tree commits, so I
dropped the akpm tree patch.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature