| commit | 92b4e113155f9c8de9ef71ecdf55d796b68e7318 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 02 16:57:23 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 02 16:57:23 2014 -0700 |
| tree | 11da79f48ac33463e5d4bccb0581728f6b53b1b2 | |
| parent | 8ee7a330fbb78344802cc6c3cc8be023b6d05aa0 [diff] | |
| parent | 368b69a5b010cb00fc9ea04d588cff69af1a1359 [diff] |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 fix from Peter Anvin: "A single quite small patch that managed to get overlooked earlier, to prevent a user space triggerable oops on systems without HPET" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, vdso: Fix an OOPS accessing the HPET mapping w/o an HPET