diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 12:44:35 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 12:44:35 (GMT) |
| commit | 478e1a141c6c5d6c060ff0af9dfcf88aa6f59ac3 (patch) | |
| tree | 98ea95ded39a957838910c6cdf9859429fec4064 /arch/blackfin | |
| parent | 04cf794165786a8e850c7f1e755a222148b0e377 (diff) | |
| parent | 8ba85f8bffdfbac98dac8630406f7d020103db70 (diff) | |
| download | linux-fsl-qoriq-478e1a141c6c5d6c060ff0af9dfcf88aa6f59ac3.tar.xz | |
Merge branch 'lpc32xx/core-fixes' of git://git.antcom.de/linux-2.6 into next/soc
From Roland Stigge <stigge@antcom.de>:
This is the pull request including the fix for the compile error caused
by lpc32xx-next and dma branches collisions in linux-next.
* 'lpc32xx/core-fixes' of git://git.antcom.de/linux-2.6:
ARM: LPC32xx: Adjust to pl08x DMA interface changes
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/blackfin')
0 files changed, 0 insertions, 0 deletions