]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 04:01:40 +0000 (14:01 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 04:01:40 +0000 (14:01 +1000)
commitee79da978ba16f978837da91f6908ce836f5c2e1
treef85d891641e3bff315cccca08bdb3837901ab978
parent71a83d8d487d3454cec5ab90e776103d481b0273
parente15802caae469ba0d5f59e3a28f53d1accf7f332
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
include/linux/kvm.h
Documentation/kernel-parameters.txt
include/linux/kvm.h