nothing here...just a nuther DOH!!!!!
mach-tegra: edp.c: workaround to keep edp levels appropriate

Conflicts:
	arch/arm/mach-tegra/edp.c
include: linux: pm_qos_params.h: hard code max cpus to 4
mach-tegra: kconfig: typo fix