From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Sep 2010 19:02:22 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
X-Git-Tag: v2.6.36-rc6~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0d70397bc72f2122f9702093cce3039ec3ae7575;p=linux.git

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
---

0d70397bc72f2122f9702093cce3039ec3ae7575