Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 20:50:46 +0000 (13:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 20:50:46 +0000 (13:50 -0700)
commit9b6a3df372f0318bb0ffe37ac5f4610fb9bdb44d
tree88b76c84a21927acffd02f556764c4be33258bce
parentd3acd16cda3a1cbaff7c579c0e054f0ece613d14
parent6faf17f6f1ffc586d16efc2f9fa2083a7785ee74
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