diff options
| author | Linus Torvalds <[email protected]> | 2012-07-13 15:42:32 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2012-07-13 15:42:32 +0000 |
| commit | e7654c1e49b8fd79baa8616f601c620013a027c1 (patch) | |
| tree | da8e870c89229624654129fb27b4e53d50fda0e1 /fs/jbd2/commit.c | |
| parent | block: fix infinite loop in __getblk_slow (diff) | |
| parent | Merge branch 'for-upstream-master' of git://github.com/agraf/linux-2.6 (diff) | |
| download | kernel-e7654c1e49b8fd79baa8616f601c620013a027c1.tar.gz kernel-e7654c1e49b8fd79baa8616f601c620013a027c1.zip | |
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull a couple of KVM fixes from Avi Kivity:
"One is an adjustment for an irq layer change that affected device
assignment, the other a one-liner ppc fix."
* git://git.kernel.org/pub/scm/virt/kvm/kvm:
powerpc/kvm: Fix "PR" KVM implementation of H_CEDE
KVM: Fix device assignment threaded irq handler
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions