]> git.kernelconcepts.de Git - karo-tx-linux.git/commit - drivers/usb/host/xhci.c
Merge remote-tracking branch 'arm/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:32:29 +0000 (14:32 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:32:29 +0000 (14:32 +0200)
commitff250e2c6670f14e35a1b6b18adbdaa55938a09a
tree2b001b46c7f479414d3919976b90b8b07bc4b5c7
parent7ffb712165f5d95988d22753d580f0c30f8084eb
parent8b7312c3cfa25ad3901b6446ea55a743baf2b432
Merge remote-tracking branch 'arm/for-next'

Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
arch/arm/mm/dma-mapping.c
arch/arm/mm/init.c
drivers/dma/edma.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/of/platform.c
tools/perf/config/feature-tests.mak