* linux-next: pci/x86 merge conflicts
@ 2008-06-11 3:10 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2008-06-11 3:10 UTC (permalink / raw)
To: Jesse Barnes
Cc: linux-next, Miklos Vajna, Paolo Ciarrocchi, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin
[-- Attachment #1: Type: text/plain, Size: 509 bytes --]
Hi Jesse,
Today's linux-next merge of the pci tree got trivial conflicts in
arch/x86/pci/irq.c between commit
7058b06188232381c13ff05a3caf458bb892b834 ("x86: coding style fixes to
arch/x86/pci/irq") from the x86 tree and commit
273c11270d3715c4c06d4df1607a1a60034d887b ("x86/PCI: janitor work in
irq.c") from the pci tree.
They were just formatting differences so I chose the pci versions.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-06-11 3:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-06-11 3:10 linux-next: pci/x86 merge conflicts Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).