projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1d51433 3c56b3a)
Merge tag 'stable/for-linus-4.0-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Apr 2015 20:53:53 +0000 (13:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Apr 2015 20:53:53 +0000 (13:53 -0700)
commitb0838b150160f90be0903a38a2ce11d764962752
tree39c71db2c10e4115c7755142b0444191f32b9c07tree | snapshot
parent1d514333da19410751c195cc715f9dbe1bb4b08fcommit | diff
parent3c56b3a12ce52f361468cbdd2f79b2f3b8da0ea6commit | diff
Merge tag 'stable/for-linus-4.0-rc6-tag' of git://git./linux/kernel/git/xen/tip

Pull xen regression fixes from David Vrabel:
 "Fix two regressions in the balloon driver's use of memory hotplug when
  used in a PV guest"

* tag 'stable/for-linus-4.0-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/balloon: before adding hotplugged memory, set frames to invalid
  x86/xen: prepare p2m list for memory hotplug
John Crispins staging tree