Merge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jun 2010 22:46:09 +0000 (15:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jun 2010 22:46:09 +0000 (15:46 -0700)
commitb01b7dc2832a1a286ae84ffa3e940ce9f8e352c2
treee1c9325123f19729803a4ce3dc3c5cd7e17469b0
parentf150dba6d4a1e275b62ca76572c2786c71b91e85
parentb3831cb55d383e8eb55d3b56c715fb48459b87c9
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