diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-07-18 15:50:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-18 15:50:40 +0200 |
| commit | 5304d5fc74a269cc6c3e70f9713684ca729abdf0 (patch) | |
| tree | 6a5db62915abd260241a2b9aee34086c93293ca6 /include/linux/kernel.h | |
| parent | sched: Hide runqueues from direct reference at source code level for __raw_get_cpu_var() (diff) | |
| parent | Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
| download | wireguard-linux-5304d5fc74a269cc6c3e70f9713684ca729abdf0.tar.xz wireguard-linux-5304d5fc74a269cc6c3e70f9713684ca729abdf0.zip | |
Merge branch 'linus' into sched/core
Merge reason: branch had an old upstream base (-rc1-ish), but also
merge to avoid a conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/kernel.h')
0 files changed, 0 insertions, 0 deletions