commit | 478c6a43fcbc6c11609f8cee7c7b57223907754f | [log] [tgz] |
---|---|---|
author | Len Brown <len.brown@intel.com> | Sun Apr 05 02:14:15 2009 -0400 |
committer | Len Brown <len.brown@intel.com> | Sun Apr 05 02:14:15 2009 -0400 |
tree | a7f7952099da60d33032aed6de9c0c56c9f8779e | |
parent | 8a3f257c704e02aee9869decd069a806b45be3f1 [diff] | |
parent | 6bb597507f9839b13498781e481f5458aea33620 [diff] |
Merge branch 'linus' into release Conflicts: arch/x86/kernel/cpu/cpufreq/longhaul.c Signed-off-by: Len Brown <len.brown@intel.com>