]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 06:07:33 +0000 (16:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 06:07:33 +0000 (16:07 +1000)
commit12acdf24fb9ee41f11ed50cab58e3672a88e1ccf
tree871513a00241341ee4e4e5059925a60e23f1f5c9
parentc72154f5e83a15b69ca51a5e1f19c614d7eeab07
parente15802caae469ba0d5f59e3a28f53d1accf7f332
Merge remote-tracking branch 'kvm/linux-next'

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