diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-03-05 21:48:31 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 21:48:50 +0100 |
| commit | a1413c89ae6a4b7a9a43f7768934a81ffb5c629a (patch) | |
| tree | 7e16be26407c5fd4dfbfeb98b11590809a963664 /fs/btrfs/tree-log.c | |
| parent | x86: un-__init fill_pud/pmd/pte (diff) | |
| parent | x86: add Dell XPS710 reboot quirk (diff) | |
| download | wireguard-linux-a1413c89ae6a4b7a9a43f7768934a81ffb5c629a.tar.xz wireguard-linux-a1413c89ae6a4b7a9a43f7768934a81ffb5c629a.zip | |
Merge branch 'x86/urgent' into x86/core
Conflicts:
arch/x86/include/asm/fixmap_64.h
Semantic merge:
arch/x86/include/asm/fixmap.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/btrfs/tree-log.c')
0 files changed, 0 insertions, 0 deletions