tree a7f7952099da60d33032aed6de9c0c56c9f8779e
parent 8a3f257c704e02aee9869decd069a806b45be3f1
parent 6bb597507f9839b13498781e481f5458aea33620
author Len Brown <len.brown@intel.com> 1238912055 -0400
committer Len Brown <len.brown@intel.com> 1238912055 -0400

Merge branch 'linus' into release

Conflicts:
	arch/x86/kernel/cpu/cpufreq/longhaul.c

Signed-off-by: Len Brown <len.brown@intel.com>