Merge branch 'kvm-updates/2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 21 Sep 2008 19:40:56 +0000 (12:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 21 Sep 2008 19:40:56 +0000 (12:40 -0700)
commit8186e1aabd3db3af1b16d770314816059a17f011
tree938273c283594304dc5a0e6d1efd32a1a87f4b19
parent2855737a88c90d070d1e80b3552db1713dd9a167
parent7e68f390fbba2d87b0f40fd6cab8cd3c991a2e12
Merge branch 'kvm-updates/2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm

* 'kvm-updates/2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
  KVM: ia64: 'struct fdesc' build fix