]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.8/single-zimage' into for-next
authorStephen Warren <swarren@nvidia.com>
Thu, 25 Oct 2012 20:34:24 +0000 (14:34 -0600)
committerStephen Warren <swarren@nvidia.com>
Thu, 25 Oct 2012 20:34:24 +0000 (14:34 -0600)
1  2 
arch/arm/mach-tegra/timer.c

Simple merge