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)
commit6f21d806f698a5c437dcae1f03e8dd73e3f5aab1
tree938273c283594304dc5a0e6d1efd32a1a87f4b19
parente59e14b6602a106c5f88b70264f814a987b2d7a4
parent9f7263236aa4401f8e52cae084f652175b7a7b5f
Merge branch 'kvm-updates/2.6.27' of git://git./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