From: Linus Torvalds 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: v2.6.35-rc2~46 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2 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