| commit | b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 03 15:46:09 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 03 15:46:09 2010 -0700 |
| tree | e1c9325123f19729803a4ce3dc3c5cd7e17469b0 | |
| parent | f150dba6d4a1e275b62ca76572c2786c71b91e85 [diff] | |
| parent | b3831cb55d383e8eb55d3b56c715fb48459b87c9 [diff] |
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