Merge branch 'linus' into pci-for-jesse
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 20:39:59 +0000 (22:39 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 20:39:59 +0000 (22:39 +0200)
commit0679c2f47d50651018dd5e0bf35330f6e6ae35ec
tree2df65ebb958f930abf0b7ad35fd6e528398b1679
parent76fbc263ff7e42ce8b21b8aee176e3c74b45f81a
parent5b664cb235e97afbf34db9c4d77f08ebd725335e
Merge branch 'linus' into pci-for-jesse
drivers/pci/probe.c
drivers/pci/setup-bus.c