Merge branch 'for-3.6/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren...

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>