linux-next: manual merge of the xen tree with Linus tree
From: Stephen Rothwell
Date: Fri Jan 14 2011 - 20:05:57 EST
Hi all,
Today's linux-next merge of the xen tree got a conflict in
drivers/xen/Kconfig, drivers/xen/gntdev.c and include/xen/gntdev.h
between various commits Linus' tree and various commits from the xen tree.
As previously discussed, I have dropped the xen tree for today (as it
contains an older version of the changes that were merged into Linus'
tree).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp00000.pgp
Description: PGP signature