diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-08-05 21:55:52 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-08-05 22:00:32 (GMT) |
| commit | b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8 (patch) | |
| tree | 221d6c5be36fa3b2133200ebc3e520d4382dca8f /arch/x86/lguest/boot.c | |
| parent | c948c26048ecb1023d2e68222c736f7da41da498 (diff) | |
| parent | cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f (diff) | |
| download | linux-b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8.tar.xz | |
Merge branch 'linus' into x86/apic
Pull in upstream changes to avoid conflicts
Diffstat (limited to 'arch/x86/lguest/boot.c')
0 files changed, 0 insertions, 0 deletions