diff options
| author | Thomas Gleixner | 2015-08-05 23:55:52 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2015-08-06 00:00:32 +0200 |
| commit | b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8 (patch) | |
| tree | 221d6c5be36fa3b2133200ebc3e520d4382dca8f /include/linux/glob.h | |
| parent | x86/apic: Drop local_irq_save/restore in timer callbacks (diff) | |
| parent | Linux 4.2-rc4 (diff) | |
| download | kernel-qcow2-linux-b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8.tar.gz kernel-qcow2-linux-b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8.tar.xz kernel-qcow2-linux-b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8.zip | |
Merge branch 'linus' into x86/apic
Pull in upstream changes to avoid conflicts
Diffstat (limited to 'include/linux/glob.h')
0 files changed, 0 insertions, 0 deletions