Merge branch 'linus' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 20:00:54 +0000 (22:00 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 20:00:54 +0000 (22:00 +0200)
Conflicts:

drivers/acpi/processor_throttling.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge