summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-03 04:28:58 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-03 04:28:58 +0100
commitb1792e367053968f2ddb48bc911d314143ce6242 (patch)
tree31ac3fddb0b14a202e9ceaa9681c1335ba35210c /net
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pen... (diff)
parentPCI hotplug: Change link order of pciehp & acpiphp (diff)
downloadlinux-b1792e367053968f2ddb48bc911d314143ce6242.tar.xz
linux-b1792e367053968f2ddb48bc911d314143ce6242.zip
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 hotplug: Change link order of pciehp & acpiphp PCI hotplug: fakephp: Allocate PCI resources before adding the device PCI MSI: Fix undefined shift by 32 PCI PM: Do not wait for buses in B2 or B3 during resume PCI PM: Power up devices before restoring their state PCI PM: Fix hibernation breakage on EeePC 701 PCI: irq and pci_ids patch for Intel Tigerpoint DeviceIDs PCI PM: Fix suspend error paths and testing facility breakage
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions