| commit | 9b6a3df372f0318bb0ffe37ac5f4610fb9bdb44d | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 5 Sep 2009 20:50:46 +0000 (5 13:50 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 5 Sep 2009 20:50:46 +0000 (5 13:50 -0700) | ||
| tree | 88b76c84a21927acffd02f556764c4be33258bce | treesnapshot (tar.gz zip) |
| parent | d3acd16cda3a1cbaff7c579c0e054f0ece613d14 | commitdiff |
| parent | 6faf17f6f1ffc586d16efc2f9fa2083a7785ee74 | commitdiff |
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
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI SR-IOV: correct broken resource alignment calculations