]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jun 2010 14:41:04 +0000 (07:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jun 2010 14:41:04 +0000 (07:41 -0700)
commitdee70a32fa90cd05a5e34d03a48d549473569101
tree1aab213cb310996fd2f0a324ef5b0c61d3d2e0e6
parent29ccb201a28f20885c90954152db8421a2efe779
parentb27759f880018b0cd43543dc94c921341b64b5ec
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/PM: Do not use native PCIe PME by default