diff options
author | Ingo Molnar <mingo@elte.hu> | 2012-03-14 09:48:16 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-03-14 09:48:16 +0100 |
commit | c96a9876696d30783ad54399351a0bf3660db53f (patch) | |
tree | 74daba0ed1fd2838e8eb527c4f7fe5262ee979bd /arch/x86/kernel/smpboot.c | |
parent | x86/olpc/xo15/sci: Enable lid close wakeup control (diff) | |
parent | Linux 3.3-rc7 (diff) | |
download | linux-c96a9876696d30783ad54399351a0bf3660db53f.tar.xz linux-c96a9876696d30783ad54399351a0bf3660db53f.zip |
Merge tag 'v3.3-rc7' into x86/platform
Merge reason: Update to the almost-final v3.3 kernel.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
0 files changed, 0 insertions, 0 deletions