projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 02b9735 6a6f6e7)
Merge tag 'stable/for-linus-3.12-rc0-tag-three' of git://git.kernel.org/pub/scm/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Sep 2013 18:28:24 +0000 (11:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Sep 2013 18:28:24 +0000 (11:28 -0700)
commitd5adf7e2db897f9d4a00be59262875ae5d9574f4
treec6417bfea552f653d5639b4696a5ac987cd7bc40tree | snapshot
parent02b9735c12892e04d3e101b06e4c6d64a814f566commit | diff
parent6a6f6e72eca5ed999689c69d1ac411fe319844a0commit | diff
Merge tag 'stable/for-linus-3.12-rc0-tag-three' of git://git./linux/kernel/git/xen/tip

Pull Xen balloon driver bug-fixes from Stefano Stabellini:
 - fix a preemption bug in xen/balloon.c;
 - remove an harmful BUG_ON in xen/balloon.c that can trigger in
   non-erroneous situations.

* tag 'stable/for-linus-3.12-rc0-tag-three' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/balloon: remove BUG_ON in increase_reservation
  xen/balloon: ensure preemption is disabled when using a scratch page
Domain: System / Kernel;