Merge branch 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci into next/fixes-non-critical

Browse source

* 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci:
  ARM: davinci: map default_queue to edma channels

...

This commit is contained in:

Arnd Bergmann 2012-02-27 14:25:51 +00:00

parent d0cdd82c6e 0b7580ba9d

commit 5a8c271b26

2 changed files with 6 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

arch/arm/mach-davinci/dma.c

View file

5

arch/arm/mach-davinci/include/mach/edma.h

View file