summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-26 19:01:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-26 19:01:15 -0700
commitdc7acbb2518f250050179c8581a972df3b6a24f1 (patch)
treebc14a36d5cfe1a1aa0d9a2a18ea6f19ad88a8958 /crypto
parentf01e1af445fac107e91d62a2d59dd535f633810b (diff)
parent4bf0ff24e371ce71521ccb21513203facfd8491f (diff)
downloadblackbird-op-linux-dc7acbb2518f250050179c8581a972df3b6a24f1.tar.gz
blackbird-op-linux-dc7acbb2518f250050179c8581a972df3b6a24f1.zip
Merge branch 'upstream/tidy-xen-mmu-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
* 'upstream/tidy-xen-mmu-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: xen: fix compile without CONFIG_XEN_DEBUG_FS Use arbitrary_virt_to_machine() to deal with ioremapped pud updates. Use arbitrary_virt_to_machine() to deal with ioremapped pmd updates. xen/mmu: remove all ad-hoc stats stuff xen: use normal virt_to_machine for ptes xen: make a pile of mmu pvop functions static vmalloc: remove vmalloc_sync_all() from alloc_vm_area() xen: condense everything onto xen_set_pte xen: use mmu_update for xen_set_pte_at() xen: drop all the special iomap pte paths.
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud