| commit | 5a8c271b26b83a09924c99aaa5c607021aed142b | |
| author | Arnd Bergmann <arnd@arndb.de> | |
| Mon, 27 Feb 2012 14:25:51 +0000 (27 14:25 +0000) | ||
| committer | Arnd Bergmann <arnd@arndb.de> | |
| Mon, 27 Feb 2012 14:25:51 +0000 (27 14:25 +0000) | ||
| tree | 94e234ab022ee16bb5c8252a62f5ef7833c8b6f5 | treesnapshot (tar.gz zip) |
| parent | d0cdd82c6e0944df733b28f5d4cbbe97298587e4 | commitdiff |
| parent | 0b7580ba9d4ac653cf39fa754c21fa36c080e444 | commitdiff |
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
* 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci:
ARM: davinci: map default_queue to edma channels