diff options
| author | Ingo Molnar | 2008-07-18 22:00:54 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-18 22:00:54 +0200 |
| commit | bb2c018b09b681d43f5e08124b83e362647ea82b (patch) | |
| tree | d794902c78f9fdd04ed88a4b8d451ed6f9292ec0 /kernel/rtmutex-tester.c | |
| parent | Merge branch 'linus' into cpus4096 (diff) | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | kernel-qcow2-linux-bb2c018b09b681d43f5e08124b83e362647ea82b.tar.gz kernel-qcow2-linux-bb2c018b09b681d43f5e08124b83e362647ea82b.tar.xz kernel-qcow2-linux-bb2c018b09b681d43f5e08124b83e362647ea82b.zip | |
Merge branch 'linus' into cpus4096
Conflicts:
drivers/acpi/processor_throttling.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/rtmutex-tester.c')
0 files changed, 0 insertions, 0 deletions