linux-next: manual merge of the uprobes tree with the tip tree

[Stephen Rothwell]

Hi Srikar,

Today's linux-next merge of the uprobes tree got a conflicts in various
files between commits from the tip tree and commits from the uprobes tree.

It looks like a later (and different) version of the uprobes patch set has
been merged into the tip tree.  So I have dropped the uprobes tree
changes for today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature