diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-20 18:01:33 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-20 18:01:33 +0200 |
commit | ef46222e7b56e728e423527d430cb2013c595491 (patch) | |
tree | e0e540f992aae6dfd3bfa1f8de42461ac1656c1a /security/device_cgroup.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
parent | xen/setup: Fix for incorrect xen_extra_mem_start. (diff) | |
download | linux-ef46222e7b56e728e423527d430cb2013c595491.tar.xz linux-ef46222e7b56e728e423527d430cb2013c595491.zip |
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/setup: Fix for incorrect xen_extra_mem_start.
xen: When calling power_off, don't call the halt function.
xen: Fix compile warning when CONFIG_SMP is not defined.
xen: support CONFIG_MAXSMP
xen: partially revert "xen: set max_pfn_mapped to the last pfn mapped"
Diffstat (limited to 'security/device_cgroup.c')
0 files changed, 0 insertions, 0 deletions