]> err.no Git - linux-2.6/commitdiff
Merge branch 'x86/unify-pci' into x86/core
authorIngo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 16:47:29 +0000 (18:47 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 16:47:29 +0000 (18:47 +0200)

Trivial merge