tree 705c1a996bed8fd48ce94ff33ec9fd00f9b94875
parent db2fb9db5735cc532fd4fc55e94b9a3c3750378e
parent e1036502e5263851259d147771226161e5ccc85a
author Dave Jones <davej@redhat.com> 1165963301 -0500
committer Dave Jones <davej@redhat.com> 1165963301 -0500

Merge ../linus

Conflicts:

	drivers/cpufreq/cpufreq.c