From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Sep 2009 20:50:46 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: v2.6.31-rc9~15
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=9b6a3df372f0318bb0ffe37ac5f4610fb9bdb44d

Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI SR-IOV: correct broken resource alignment calculations
---

9b6a3df372f0318bb0ffe37ac5f4610fb9bdb44d