diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-06-20 14:22:32 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-06-20 14:22:34 +0200 |
commit | 6a991acceedce3ca93caef8ba7af2468c9451614 (patch) | |
tree | 1997d71fc57bdebd12fc70a73070281614b52f15 /kernel/futex_compat.c | |
parent | x86: Save cr2 in NMI in case NMIs take a page fault (for i386) (diff) | |
parent | Linux 3.5-rc3 (diff) | |
download | linux-6a991acceedce3ca93caef8ba7af2468c9451614.tar.xz linux-6a991acceedce3ca93caef8ba7af2468c9451614.zip |
Merge commit 'v3.5-rc3' into x86/debug
Merge it in to pick up a fix that we are going to clean up in this
branch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/futex_compat.c')
0 files changed, 0 insertions, 0 deletions