linux-next: manual merge of the x86 tree
From: Stephen Rothwell <hidden>
Date: 2008-07-18 02:29:23
Hi all,
Today's linux-next merge of the x86 tree got a trivial conflict in
include/asm-x86/pci-direct.h between commit
e3f2baebf4209b5927e23fa65d5977d31db936b3 ("PCI/x86: early dump pci conf
space v2") from Linus' tree and commit
aa27f95867447916d97c7aa6e5422ff6518630dd ("x86: consolidate header
guards") from the x86 tree.
Just a simple add/modify overlap.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/ Attachments
- (unnamed) [application/pgp-signature] 197 bytes