mach-tegra: edp.c: workaround to keep edp levels appropriate
Revert "Revert "net: wireless: bcmdhd: Enable P2P probe request handling only during discovery""

This reverts commit 373d74c0df2a3da125883491a876c2ec786b19a6.
Revert "Revert "arm: tegra: Fix modem_reset_flag assignment""

This reverts commit 9c0656765d23cbd250d521ee4626c8793167034a.
mach-tegra: tegra3_dvfs.c: increase some voltages
mach-tegra: board-grouper-panel.c: set min SD brightness to 10
include: linux: pm_qos_params.h: hard code max cpus to 4