]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb565f2fe5681aa014321e593414d9dae80ba1901
tree777ed3793d6fa999cbe700ae09181efec8d076a4
parentcf545a12a3d1c75ce74e3aed54a3c5ac1eeaceb1
parent266b667c9395726d9cdff46c110a397ef2b7ddb2
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