Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Sep 2010 19:02:22 +0000 (12:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Sep 2010 19:02:22 +0000 (12:02 -0700)
commit0d70397bc72f2122f9702093cce3039ec3ae7575
tree777ed3793d6fa999cbe700ae09181efec8d076a4
parenta2724f28d9f99b7b42e800b528902f0e3321873b
parent0e52247a2ed1f211f0c4f682dc999610a368903f
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: fix pci_resource_alignment prototype