]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'for-3.7/dmaengine' into for-next
authorStephen Warren <swarren@nvidia.com>
Mon, 17 Sep 2012 15:47:24 +0000 (09:47 -0600)
committerStephen Warren <swarren@nvidia.com>
Mon, 17 Sep 2012 15:47:24 +0000 (09:47 -0600)
commit67b68bf40ca6f973086bb1c5c0dccd357ad7cb15
tree7647b0dc4552763cdefff0fb5e554d0c62b3a432
parentbb8c8f3f77d9d025abc5840f34f6f9a2b61a2d3c
parent9891e3240543c45176b1298164418b61e8909ed0
Merge branch 'for-3.7/dmaengine' into for-next

Conflicts:
arch/arm/mach-tegra/dma.c
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/apbio.c