| commit | 2fe5de9ce7d57498abc14b375cad2fcf8c3ee6cc | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed May 07 13:15:46 2014 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed May 07 13:15:46 2014 +0200 |
| tree | 9478e8cf470c1d5bdb2d89b57a7e35919ab95e72 | |
| parent | 08f8aeb55d7727d644dbbbbfb798fe937d47751d [diff] | |
| parent | 2b4cfe64dee0d84506b951d81bf55d9891744d25 [diff] |
Merge branch 'sched/urgent' into sched/core, to avoid conflicts Signed-off-by: Ingo Molnar <mingo@kernel.org>