Merge kernel/common up to eda70fdf37017ebeff0076e031b872607f28a713 (May 28 15:18:29 2013)

Conflicts:
	Documentation/cpu-freq/governors.txt
	drivers/cpufreq/cpufreq_interactive.c
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/include/epivers.h
	drivers/net/wireless/bcmdhd/wl_cfg80211.c