Merge branch 'topic/stratus' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 7 May 2012 15:23:27 +0000 (09:23 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 7 May 2012 15:23:27 +0000 (09:23 -0600)
commit0cbaa57d828aa0a067e06d3c6d795b12ae9fb776
tree871e08f70566b16736ae228eddac018c77ca1144
parent99662dd1ce05dbe6394771fcb6ca21bd2aa35987
parent284f5f9dbac170b054c1e386ef92cbf654e91bba
Merge branch 'topic/stratus' into next
arch/x86/pci/common.c
drivers/pci/pci.c
drivers/pci/probe.c