| commit | b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8 | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Wed Aug 05 23:55:52 2015 +0200 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Thu Aug 06 00:00:32 2015 +0200 |
| tree | 221d6c5be36fa3b2133200ebc3e520d4382dca8f | |
| parent | c948c26048ecb1023d2e68222c736f7da41da498 [diff] | |
| parent | cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f [diff] |
Merge branch 'linus' into x86/apic Pull in upstream changes to avoid conflicts