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

Conflicts:

drivers/acpi/processor_throttling.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
drivers/acpi/processor_throttling.c
kernel/cpu.c