diff options
author | 2013-06-20 15:06:57 +0200 | |
---|---|---|
committer | 2013-06-20 15:06:57 +0200 | |
commit | a0639948b6fb28ebf2063b58ae6e0f4de693f6c3 (patch) | |
tree | 7ffe6f1caa94a70d56197dad151b556b36fba681 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | ARM: u300: only build for ARCH_MULTI_V5 (diff) | |
parent | ARM: edma: remove unused transfer controller handlers (diff) | |
download | linux-dev-a0639948b6fb28ebf2063b58ae6e0f4de693f6c3.tar.xz linux-dev-a0639948b6fb28ebf2063b58ae6e0f4de693f6c3.zip |
Merge tag 'davinci-for-v3.11/soc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
From Sekhar Nori:
DaVinci SoC changes for v3.11
This pull request moves DaVinci EDMA library to
arch/arm/common so it can be used by OMAP based AM335x.
This is a temporary step until all drivers are converted
to use the dmaengine driver in drivers/dma/edma.c.
Several drivers like SPI, MMC/SD have already been converted.
Some like audio are pending.
The other two patches in the pull request are cleanup in nature.
* tag 'davinci-for-v3.11/soc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: edma: remove unused transfer controller handlers
ARM: davinci: move private EDMA API to arm/common
ARM: davinci: remove __init atrribute from function declaration
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions