Merge branch 'android-3.0' of https://android.googlesource.com/kernel/common into cm-11.0

Conflicts:
	drivers/cpufreq/cpufreq_interactive.c
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/include/epivers.h
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.h
	drivers/net/wireless/bcmdhd/wl_cfgp2p.c
	kernel/cgroup.c