Merge branches 'for-3.2/cleanup' and 'for-3.2/features' into for-next

author Olof Johansson <olof@lixom.net>

Wed, 12 Oct 2011 23:26:29 +0000 (16:26 -0700)

committer Olof Johansson <olof@lixom.net>

Wed, 12 Oct 2011 23:26:29 +0000 (16:26 -0700)
author Olof Johansson <olof@lixom.net>
Wed, 12 Oct 2011 23:26:29 +0000 (16:26 -0700)
committer Olof Johansson <olof@lixom.net>
Wed, 12 Oct 2011 23:26:29 +0000 (16:26 -0700)
diff --cc arch/arm/mach-tegra/cpu-tegra.c
Simple merge
author	Olof Johansson <olof@lixom.net>
	Wed, 12 Oct 2011 23:26:29 +0000 (16:26 -0700)
committer	Olof Johansson <olof@lixom.net>
	Wed, 12 Oct 2011 23:26:29 +0000 (16:26 -0700)