diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-02-08 10:55:43 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-02-08 10:55:46 +0300 |
commit | 6d3e0907b8b239d16720d144e2675ecf10d3bc3b (patch) | |
tree | e0b0743b5f6f82b057cafc4f3687396a6e01a0b4 /arch/m32r/include/asm/shmparam.h | |
parent | 23577256953c870de9b724c3a2611ce7be6a1e4e (diff) | |
parent | 50200df462023b187d80a99a52f5f2cfe3c86c26 (diff) | |
download | linux-6d3e0907b8b239d16720d144e2675ecf10d3bc3b.tar.xz |
Merge branch 'sched/urgent' into sched/core
Merge reason: Merge dependent fix, update to latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m32r/include/asm/shmparam.h')
0 files changed, 0 insertions, 0 deletions