Merge branch 'lpc32xx/drivers' into next/drivers

* lpc32xx/drivers: (566 commits)
  ARM: LPC32xx: ADC support for mach-lpc32xx

Includes an update to Linux 3.3-rc4

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index e91d73c8aa4e..94be6c32fa7d 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -5012,7 +5012,8 @@ static int igb_find_enabled_vfs(struct igb_adapter *adapter)
         vf_devfn = pdev->devfn + 0x80;
         pvfdev = pci_get_device(hw->vendor_id, device_id, NULL);
         while (pvfdev) {
-                if (pvfdev->devfn == vf_devfn)
+                if (pvfdev->devfn == vf_devfn &&
+                    (pvfdev->bus->number >= pdev->bus->number))
                         vfs_found++;
                 vf_devfn += vf_stride;
                 pvfdev = pci_get_device(hw->vendor_id,