diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-23 16:23:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-23 16:23:05 +0200 |
| commit | 63e5c39859a41591662466028c4d1281c033c05a (patch) | |
| tree | 1fbb0c2b76673e9557688ee607aa61d92855bebe /drivers/ata/pata_sil680.c | |
| parent | 695698500912c4479ddf4723e492de3970ff8530 (diff) | |
| parent | fa748203175de7c08f2df80e5a0eeca40329b5e2 (diff) | |
| parent | c8bfff6dd4d41834f4952cbc49e28e31906a6188 (diff) | |
Merge branches 'sched/urgent' and 'sched/rt' into sched/devel