Merge ../linus

Conflicts:

	drivers/cpufreq/cpufreq.c