Ondemand: change value towards battery life and change 2-phase freq to 1150MHz

Conflicts:

	arch/arm/mach-tegra/board-grouper.c