]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm/for-next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:19:39 +0000 (11:19 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:19:39 +0000 (11:19 +0200)
commitbab8a7d8d287af091eb751b75c09df27b8b12f96
treed7dc97b22b7a5768f14b2aec5ff34659603edc13
parentaf2e4fb34b011762d2341fee6bca53d1fdb8082a
parent8ead89f7e42fa9723d48dab389e59d78992e1cc3
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