[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[linux-2.6] / arch / powerpc / platforms / celleb / beat.h
2007-02-11  Dave Jones[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
2007-02-09  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-02-09  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-02-08  David S. MillerMerge branch 'HEAD' of /linux/kernel/git/herbert/crypto-2.6
2007-02-08  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-02-08  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/driver-2.6
2007-02-08  Linus TorvaldsMerge /pub/scm/linux/kernel/git/paulus/powerpc
2007-02-07  Paul MackerrasMerge branch 'linux-2.6'
2007-02-07  Ishizaki Kou[POWERPC] Celleb: basic support