diff options
author | 2010-08-23 18:29:18 -0700 | |
---|---|---|
committer | 2010-08-23 18:29:18 -0700 | |
commit | c05e1e23b8e5cf6c3a499e4aeb8503dcb3924394 (patch) | |
tree | d159b9722131e32288cd66030ee002e1ed808602 /tools/perf/scripts/python/syscall-counts.py | |
parent | Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 (diff) | |
parent | xen: pvhvm: make it clearer that XEN_UNPLUG_* define bits in a bitfield (diff) | |
download | linux-dev-c05e1e23b8e5cf6c3a499e4aeb8503dcb3924394.tar.xz linux-dev-c05e1e23b8e5cf6c3a499e4aeb8503dcb3924394.zip |
Merge branch 'for-upstream/pvhvm' of git://xenbits.xensource.com/people/ianc/linux-2.6
* 'for-upstream/pvhvm' of git://xenbits.xensource.com/people/ianc/linux-2.6:
xen: pvhvm: make it clearer that XEN_UNPLUG_* define bits in a bitfield
xen: pvhvm: rename xen_emul_unplug=ignore to =unnnecessary
xen: pvhvm: allow user to request no emulated device unplug
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts.py')
0 files changed, 0 insertions, 0 deletions