diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-25 20:06:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-25 20:06:38 -0700 |
| commit | c410614c902531d1ce2e46aec8ac91aa4dc89968 (patch) | |
| tree | 1b93d60437016052934be9aec893974bbd5c1872 /fs/timerfd.c | |
| parent | 5f22004ba9b4cf740773777ea7b74586743f6051 (diff) | |
| parent | 4d581259b7d44c8120a614b4e9244094c824d51f (diff) | |
| download | linux-c410614c902531d1ce2e46aec8ac91aa4dc89968.tar.gz linux-c410614c902531d1ce2e46aec8ac91aa4dc89968.tar.bz2 linux-c410614c902531d1ce2e46aec8ac91aa4dc89968.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Ingo Molnar:
"Leftover fix from the v4.7 cycle: adds a reboot quirk"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/reboot: Add Dell Optiplex 7450 AIO reboot quirk
Diffstat (limited to 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions