From: Avi Kivity <[email protected]>
* 'master' of
ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (2984
commits)
CRED: Fix RCU warning due to previous patch fixing __task_cred()'s checks
block_dev: always serialize exclusive open attempts
parisc: pass through '\t' to early (iodc) console
Documentation: update broken web addresses.
fix comment typo "choosed" -> "chosen"
hostap:hostap_hw.c Fix typo in comment
Fix spelling contorller -> controller in comments
amd64_edac: Minor formatting fix
amd64_edac: Fix operator precendence error
phy/marvell: add 88ec048 support
igb: Program MDICNFG register prior to PHY init
e1000e: correct MAC-PHY interconnect register offset for 82579
hso: Add new product ID
can: Add driver for esd CAN-USB/2 device
[CPUFREQ] Remove pointless printk from p4-clockmod.
[CPUFREQ] Fix section mismatch for powernow_cpu_init in powernow-k7.c
[CPUFREQ] Fix section mismatch for longhaul_cpu_init.
[CPUFREQ] Fix section mismatch for longrun_cpu_init.
[CPUFREQ] powernow-k8: Fix misleading variable naming
[CPUFREQ] Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
...
Conflicts:
Documentation/kvm/msr.txt
arch/x86/include/asm/kvm_emulate.h
arch/x86/kvm/emulate.c
arch/x86/kvm/mmu.c
arch/x86/kvm/x86.c
Signed-off-by: Avi Kivity <[email protected]>
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
