linux-next: manual merge of the tmem tree with the xen-two tree

From: Stephen Rothwell
Date: Wed Jun 22 2011 - 00:46:30 EST

Hi Dan,

Today's linux-next merge of the tmem tree got a conflict in
drivers/xen/Kconfig drivers/xen/tmem.c between commit afec6e04922d ("xen:
prepare tmem shim to handle frontswap") from the xen-two tree and commit
ac33c46b42ba ("xen: enable frontswap for Xen tmem") from the tmem tree.

I just used the xen-two versions of these files (as they look newer).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature