From: Len Brown Date: Sun, 5 Apr 2009 06:14:15 +0000 (-0400) Subject: Merge branch 'linus' into release X-Git-Tag: v2.6.30-rc1~199^2~3 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=478c6a43fcbc6c11609f8cee7c7b57223907754f;p=pandora-kernel.git Merge branch 'linus' into release Conflicts: arch/x86/kernel/cpu/cpufreq/longhaul.c Signed-off-by: Len Brown --- 478c6a43fcbc6c11609f8cee7c7b57223907754f Reading git-diff-tree failed