Merge branch 'for-3.7/cpu-hotplug' into for-next

author Stephen Warren <swarren@nvidia.com>

Fri, 17 Aug 2012 20:45:25 +0000 (14:45 -0600)

committer Stephen Warren <swarren@nvidia.com>

Fri, 17 Aug 2012 20:45:25 +0000 (14:45 -0600)
author Stephen Warren <swarren@nvidia.com>
Fri, 17 Aug 2012 20:45:25 +0000 (14:45 -0600)
committer Stephen Warren <swarren@nvidia.com>
Fri, 17 Aug 2012 20:45:25 +0000 (14:45 -0600)
diff --cc arch/arm/mach-tegra/Makefile
Simple merge
diff --cc arch/arm/mach-tegra/tegra20_clocks.c
Simple merge
diff --cc arch/arm/mach-tegra/tegra20_clocks_data.c
Simple merge
diff --cc arch/arm/mach-tegra/tegra30_clocks.c
Simple merge
diff --cc arch/arm/mach-tegra/tegra30_clocks_data.c
Simple merge
author	Stephen Warren <swarren@nvidia.com>
	Fri, 17 Aug 2012 20:45:25 +0000 (14:45 -0600)
committer	Stephen Warren <swarren@nvidia.com>
	Fri, 17 Aug 2012 20:45:25 +0000 (14:45 -0600)
		1	2
arch/arm/mach-tegra/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/tegra20_clocks.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/tegra20_clocks_data.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/tegra30_clocks.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/tegra30_clocks_data.c	patch \|	diff1 \|	diff2 \|	blob \| history