Messages in this thread | | | Date | Tue, 27 Jul 2010 13:32:07 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the xen tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the xen tree got a conflict in arch/x86/kernel/hpet.c between commit ff4878089e1eaeac79d57878ad4ea32910fb4037 ("x86: Do not try to disable hpet if it hasn't been initialized before") from Linus' tree and commit ef7612e63eafaa6101f5d3185ed8d9bf232ba627 ("x86: Do not try to disable hpet if it hasn't been initialized before") from the xen tree.
Two versions of the same patch. I used the version from Linus' tree since it was dated later and had been modified by Thomas. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |