]> Pileus Git - ~andy/linux/commitdiff
Merge branch 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci into...
authorArnd Bergmann <arnd@arndb.de>
Mon, 27 Feb 2012 14:25:51 +0000 (14:25 +0000)
committerArnd Bergmann <arnd@arndb.de>
Mon, 27 Feb 2012 14:25:51 +0000 (14:25 +0000)
* 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci:
  ARM: davinci: map default_queue to edma channels


Trivial merge