]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 Jul 2011 14:28:51 +0000 (07:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 Jul 2011 14:28:51 +0000 (07:28 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: conditional resource-reallocation through kernel parameter pci=realloc


Trivial merge