| commit | bb2c018b09b681d43f5e08124b83e362647ea82b | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Jul 18 22:00:54 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Jul 18 22:00:54 2008 +0200 |
| tree | d794902c78f9fdd04ed88a4b8d451ed6f9292ec0 | |
| parent | 82638844d9a8581bbf33201cc209a14876eca167 [diff] | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e [diff] |
Merge branch 'linus' into cpus4096 Conflicts: drivers/acpi/processor_throttling.c Signed-off-by: Ingo Molnar <mingo@elte.hu>