diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 15:25:51 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 15:25:51 +0100 |
commit | 5a8c271b26b83a09924c99aaa5c607021aed142b (patch) | |
tree | 94e234ab022ee16bb5c8252a62f5ef7833c8b6f5 /arch/arm/mach-lpc32xx | |
parent | Merge branch 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into n... (diff) | |
parent | ARM: davinci: map default_queue to edma channels (diff) | |
download | linux-5a8c271b26b83a09924c99aaa5c607021aed142b.tar.xz linux-5a8c271b26b83a09924c99aaa5c607021aed142b.zip |
Merge branch 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci into next/fixes-non-critical
* 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci:
ARM: davinci: map default_queue to edma channels
Diffstat (limited to 'arch/arm/mach-lpc32xx')
0 files changed, 0 insertions, 0 deletions