summaryrefslogtreecommitdiffstats
path: root/fs/splice.c
diff options
context:
space:
mode:
authorLinus Torvalds2008-05-28 03:47:59 +0200
committerLinus Torvalds2008-05-28 03:47:59 +0200
commit1ec7d99c16e69a9ed8ffeaa6c1846025b84bebad (patch)
treec01a0eb7355cb00d6db27f222559cd8bbe7c7bb3 /fs/splice.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 (diff)
parentpciehp: add message about pciehp_slot_with_bus option (diff)
downloadkernel-qcow2-linux-1ec7d99c16e69a9ed8ffeaa6c1846025b84bebad.tar.gz
kernel-qcow2-linux-1ec7d99c16e69a9ed8ffeaa6c1846025b84bebad.tar.xz
kernel-qcow2-linux-1ec7d99c16e69a9ed8ffeaa6c1846025b84bebad.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: pciehp: add message about pciehp_slot_with_bus option pci hotplug core: add check of duplicate slot name pciehp: move msleep after power off pciehp: poll cmd completion if hotplug interrupt is disabled pciehp: fix slow probing pciehp: fix NULL dereference in interrupt handler shpchp: add message about shpchp_slot_with_bus option PCI: don't enable ASPM on devices with mixed PCIe/PCI functions
Diffstat (limited to 'fs/splice.c')
0 files changed, 0 insertions, 0 deletions