]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch for-3.14/dmas-resets-rework into for-next
authorStephen Warren <swarren@nvidia.com>
Fri, 20 Dec 2013 17:55:47 +0000 (10:55 -0700)
committerStephen Warren <swarren@nvidia.com>
Fri, 20 Dec 2013 17:55:47 +0000 (10:55 -0700)
1  2 
arch/arm/mach-tegra/Kconfig

Simple merge