]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8ee7a33 368b69a)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Jun 2014 23:57:23 +0000 (16:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Jun 2014 23:57:23 +0000 (16:57 -0700)
commit92b4e113155f9c8de9ef71ecdf55d796b68e7318
tree11da79f48ac33463e5d4bccb0581728f6b53b1b2tree
parent8ee7a330fbb78344802cc6c3cc8be023b6d05aa0commit | diff
parent368b69a5b010cb00fc9ea04d588cff69af1a1359commit | 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
Ubuntu combined Linux kernel mirror