Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

diff --cc arch/ia64/kvm/kvm-ia64.c
Simple merge

diff --cc arch/ia64/kvm/vcpu.c
Simple merge

diff --cc arch/ia64/kvm/vtlb.c
Simple merge

diff --cc arch/x86/kernel/kvm.c
Simple merge