| commit | 0d70397bc72f2122f9702093cce3039ec3ae7575 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 28 12:02:22 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 28 12:02:22 2010 -0700 |
| tree | 777ed3793d6fa999cbe700ae09181efec8d076a4 | |
| parent | a2724f28d9f99b7b42e800b528902f0e3321873b [diff] | |
| parent | 0e52247a2ed1f211f0c4f682dc999610a368903f [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: fix pci_resource_alignment prototype