diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 04:50:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 04:50:44 +0100 |
| commit | f6411fe7e09b67470a2569231d6fa566c7c29b8b (patch) | |
| tree | f12d569c70ff937175eb5cde2195fccfe2fa34eb /drivers/char/toshiba.c | |
| parent | df1c99d416500da8d26a4d78777467c53ee7689e (diff) | |
| parent | f24ade3a3332811a512ed3b6c6aa69486719b1d8 (diff) | |
| parent | 9ead64974b05501bbac0d63a47c99fa786d064ba (diff) | |
Merge branches 'sched/clock', 'sched/urgent' and 'linus' into sched/core