]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 72d434c 33529aa)
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)
commit41d7272e6d6c97038351ea60edbd16e57827bc3f
tree11da79f48ac33463e5d4bccb0581728f6b53b1b2tree | snapshot
parent72d434c28221222175da34001e0ba8ff6a196d12commit | diff
parent33529aad8ebbd9579b01b864eee6e605e4946951commit | 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
Linux Kernel Source Tree.