diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-23 21:29:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-23 21:29:18 -0400 |
| commit | c05e1e23b8e5cf6c3a499e4aeb8503dcb3924394 (patch) | |
| tree | d159b9722131e32288cd66030ee002e1ed808602 /security/apparmor | |
| parent | c70662ec47191eb235bb1d0a1466b923b7a08a94 (diff) | |
| parent | 9c35e90c6fcf7f5baf27a63d9565e9f47633f299 (diff) | |
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 'security/apparmor')
0 files changed, 0 insertions, 0 deletions