diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 22:15:13 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 22:15:13 +0200 |
commit | ddb30594ee09c6f701de52222c7b2c63c484d089 (patch) | |
tree | 679cd587eada4c6a353f122591d9f8f81421e40f /arch/mips/lasat/serial.c | |
parent | c4315e943ec846df77e96cae1366547ae7baee1a (diff) | |
parent | 5b39fc0bf17028a6b18e57d33f0dcf71f28a8223 (diff) |
Merge branch 'for-3.6/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/soc
From Stephen Warren <swarren@wwwdotorg.org>:
This branch contains changes to Tegra SoC-specific code in the
mach-tegra directory; only APBIO/DMA-related patches this time around.
* 'for-3.6/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
ARM: tegra: apbio: use dmaengine based dma driver
ARM: tegra: apbio access using dma for tegra20 only
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/mips/lasat/serial.c')
0 files changed, 0 insertions, 0 deletions