diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 00:46:09 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 00:46:09 +0200 |
commit | b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2 (patch) | |
tree | e1c9325123f19729803a4ce3dc3c5cd7e17469b0 /arch/powerpc/include/asm/rio.h | |
parent | Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | xen: avoid allocation causing potential swap activity on the resume path (diff) | |
download | linux-b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2.tar.xz linux-b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2.zip |
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
Diffstat (limited to 'arch/powerpc/include/asm/rio.h')
0 files changed, 0 insertions, 0 deletions