diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 14:25:51 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 14:25:51 +0000 |
| commit | 5a8c271b26b83a09924c99aaa5c607021aed142b (patch) | |
| tree | 94e234ab022ee16bb5c8252a62f5ef7833c8b6f5 /arch/avr32/include/asm/elf.h | |
| parent | d0cdd82c6e0944df733b28f5d4cbbe97298587e4 (diff) | |
| parent | 0b7580ba9d4ac653cf39fa754c21fa36c080e444 (diff) | |
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/avr32/include/asm/elf.h')
0 files changed, 0 insertions, 0 deletions