diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-04-02 16:33:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-02 16:33:51 +0200 |
| commit | 83f2f0ed715eb15a8e13c07df479d65bbc10d8d5 (patch) | |
| tree | e47d7edefa210b328f8cfba43d170fc67d6e0671 /arch/x86/mm/fault.c | |
| parent | x86: remove duplicated code with pcpu_need_numa() (diff) | |
| parent | Merge branch 'for-linus' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff) | |
| download | linux-dev-83f2f0ed715eb15a8e13c07df479d65bbc10d8d5.tar.xz linux-dev-83f2f0ed715eb15a8e13c07df479d65bbc10d8d5.zip | |
Merge branch 'linus' into x86/urgent
Merge needed to go past commit 7ca43e756 (mm: use debug_kmap_atomic)
and fix it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/fault.c')
0 files changed, 0 insertions, 0 deletions