]> 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>
Fri, 24 Jun 2011 15:36:16 +0000 (08:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Jun 2011 15:36:16 +0000 (08:36 -0700)
commitb97c1cede312f49b68422b3bc4973e1549463d10
tree8af7cdfba131994d24ecf0bc7bc701ce11835ba2
parent443a0206d9a0022badb4e352e9e125ce98a0c826
parentaa69374f7b7684e748166de04da65e2a566a5d6d
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:
  x86/PCI/ACPI: fix type mismatch
  PCI: fix new kernel-doc warning
  PCI: Fix warning in drivers/pci/probe.c on sparc64
drivers/pci/pci.c