summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/mfp-pxa2xx.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-09 20:14:13 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-09 20:14:13 +0200
commit63f4711aec01586e92c26da08a24bff0b8d16aa2 (patch)
tree1e15b5a5820e60357274472d9d7ce6f97e808322 /arch/arm/mach-pxa/mfp-pxa2xx.c
parentMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff)
parentKVM: ia64: fix build due to typo (diff)
downloadlinux-63f4711aec01586e92c26da08a24bff0b8d16aa2.tar.xz
linux-63f4711aec01586e92c26da08a24bff0b8d16aa2.zip
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Avi Kivity: "Two asynchronous page fault fixes (one guest, one host), a powerpc page refcount fix, and an ia64 build fix." * git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: ia64: fix build due to typo KVM: PPC: Book3S HV: Fix refcounting of hugepages KVM: Do not take reference to mm during async #PF KVM: ensure async PF event wakes up vcpu from halt
Diffstat (limited to 'arch/arm/mach-pxa/mfp-pxa2xx.c')
0 files changed, 0 insertions, 0 deletions