diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 16:40:34 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 16:40:42 +0200 |
| commit | 5e62feabcc3e4127a084701ec54ffe891985b7e8 (patch) | |
| tree | 9246462da99ef4eb53c9c89a137d0a88c897f3d6 /arch/um/kernel | |
| parent | Merge branch 'x86/x2apic' into irq/sparseirq (diff) | |
| parent | x86, cleanups: Use clear_page/copy_page rather than memset/memcpy (diff) | |
| download | linux-5e62feabcc3e4127a084701ec54ffe891985b7e8.tar.xz linux-5e62feabcc3e4127a084701ec54ffe891985b7e8.zip | |
Merge branch 'x86/cleanups' into irq/sparseirq
Reason: Avoid conflicts with removal of boot_cpu_id
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/um/kernel')
0 files changed, 0 insertions, 0 deletions