summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ohci-pci.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-17 23:28:53 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-17 23:28:53 +0100
commitf3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (patch)
treebd43db7f86cd23af0c3905ff8ff991f910eba5e0 /drivers/usb/host/ohci-pci.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg... (diff)
parentMerge branches 'ehca', 'ipoib' and 'mlx4' into for-linus (diff)
downloadlinux-f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b.tar.xz
linux-f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/ehca: Use consistent types for ehca_plpar_hcall9() IB/ehca: Fix printk format warnings from u64 type change IPoIB: Do not print error messages for multicast join retries IB/mlx4: Fix memory ordering problem when posting LSO sends mlx4_core: Fix min() warning IPoIB: Fix deadlock between ipoib_open() and child interface create IPoIB: Fix hang in napi_disable() if P_Key is never found
Diffstat (limited to 'drivers/usb/host/ohci-pci.c')
0 files changed, 0 insertions, 0 deletions