diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-27 16:42:07 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-27 16:42:32 +0200 |
| commit | 6effcd92454ca5d7021b74f89fcac75209e146f9 (patch) | |
| tree | 6a3ebef5074ca4721f8f36fe85b9287a16ba2a01 /arch/m68knommu/kernel/syscalltable.S | |
| parent | x86: uv: Clean up uv_ptc_init(), use proc_create() (diff) | |
| parent | x86/paravirt: split paravirt definitions into paravirt_types.h (diff) | |
| download | linux-6effcd92454ca5d7021b74f89fcac75209e146f9.tar.xz linux-6effcd92454ca5d7021b74f89fcac75209e146f9.zip | |
Merge branch 'x86/paravirt' into x86/cleanups
Reason: The setup cleanups conflict with the paravirt cleanups. Avoid
a rather large merge conflict
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/m68knommu/kernel/syscalltable.S')
0 files changed, 0 insertions, 0 deletions