merge in for_next from the linux-omap tree, this will make easier to keep up with dvfs/omap4 patches

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>