From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Jun 2010 22:46:09 +0000 (-0700)
Subject: Merge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6
X-Git-Tag: firefly_0821_release~9833^2~1593
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6

* 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6:
  xen: avoid allocation causing potential swap activity on the resume path
  xen: ensure timer tick is resumed even on CPU driving the resume
---

b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2