linux-next: manual merge of the ptr-ret tree with the staging tree

From: Stephen Rothwell
Date: Tue Aug 13 2013 - 03:10:42 EST

Hi Rusty,

Today's linux-next merge of the ptr-ret tree got a conflict in
drivers/staging/zcache/zcache-main.c between commit 962564604873
("staging: zcache: delete it") from the staging tree and commit
8a1d41cfeaf5 ("staging/zcache: don't use PTR_RET()") from the ptr-ret

I fixed it up (the former removes the file, so I did that) and can carry
the fix as necessary (no action is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature