diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-08 19:00:55 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-08 19:00:55 +0200 |
commit | 44d51a029f95d49c5c7ccd7808f81904c20c3abd (patch) | |
tree | 41b82695b3bfb73b4146809546c2d79d6eaa4c47 /arch/arm/mach-omap2/mcbsp.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff) | |
parent | davinci: dm646x EVM: Specify reserved EDMA channel/slots (diff) | |
download | linux-44d51a029f95d49c5c7ccd7808f81904c20c3abd.tar.xz linux-44d51a029f95d49c5c7ccd7808f81904c20c3abd.zip |
Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
* 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci:
davinci: dm646x EVM: Specify reserved EDMA channel/slots
davinci: da8xx/omapl EVM: Specify reserved channels/slots
davinci: support for EDMA resource sharing
davinci: edma: provide ability to detect insufficient CC info data
davinci: da8xx: sparse cleanup: remove duplicate entries in irq priorities
davinci: DM365: fixed second serial port
Davinci: tnetv107x evm board initial support
Davinci: tnetv107x initial gpio support
Davinci: tnetv107x soc support
Davinci: tnetv107x decompresser uart definitions
Davinci: generalized debug macros
Diffstat (limited to 'arch/arm/mach-omap2/mcbsp.c')
0 files changed, 0 insertions, 0 deletions