diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-24 09:55:18 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-24 09:55:18 -0700 |
commit | ff0c4ad2c3a75ccfe6adca916e50804eb45bb2d9 (patch) | |
tree | 574f2d38793f7a08af73c40a96d6dc76af9c6f46 /arch/arm/mach-imx/dma-v1.c | |
parent | fcda12e7f6d58d61997681a9d41779e3fd2ffc94 (diff) | |
parent | 19f9d392365113f74286b1721c7c032c12cf5abd (diff) | |
download | talos-obmc-linux-ff0c4ad2c3a75ccfe6adca916e50804eb45bb2d9.tar.gz talos-obmc-linux-ff0c4ad2c3a75ccfe6adca916e50804eb45bb2d9.zip |
Merge branch 'for-upstream' of git://openrisc.net/jonas/linux
* 'for-upstream' of git://openrisc.net/jonas/linux: (24 commits)
OpenRISC: Add MAINTAINERS entry
OpenRISC: Miscellaneous
OpenRISC: Library routines
OpenRISC: Headers
OpenRISC: Traps
OpenRISC: Module support
OpenRISC: GPIO
OpenRISC: Scheduling/Process management
OpenRISC: Idle/Power management
OpenRISC: System calls
OpenRISC: IRQ
OpenRISC: Timekeeping
OpenRISC: DMA
OpenRISC: PTrace
OpenRISC: Build infrastructure
OpenRISC: Signal handling
OpenRISC: Memory management
OpenRISC: Device tree
OpenRISC: Boot code
iomap: make IOPORT/PCI mapping functions conditional
...
Diffstat (limited to 'arch/arm/mach-imx/dma-v1.c')
0 files changed, 0 insertions, 0 deletions