Merge branch 'linus' into release
authorLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 06:14:15 +0000 (02:14 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 06:14:15 +0000 (02:14 -0400)
Conflicts:
arch/x86/kernel/cpu/cpufreq/longhaul.c

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

Trivial merge